Changes of Revision 992

open5gs_2.7.2.4627.ec7c.202503092026.dsc -> open5gs_2.7.2.4629.7031.202503102026.dsc Changed
x
 
1
@@ -2,7 +2,7 @@
2
 Source: open5gs
3
 Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
4
 Architecture: any
5
-Version: 2.7.2.4627.ec7c.202503092026
6
+Version: 2.7.2.4629.7031.202503102026
7
 Maintainer: Harald Welte <laforge@gnumonks.org>
8
 Uploaders: Sukchan Lee <acetcom@gmail.com>
9
 Homepage: https://open5gs.org
10
@@ -32,8 +32,8 @@
11
  open5gs-udr deb net optional arch=any
12
  open5gs-upf deb net optional arch=any
13
 Checksums-Sha1:
14
- 8d47f7f2a773e448fe93777c394315bcdd512ab7 14526700 open5gs_2.7.2.4627.ec7c.202503092026.tar.xz
15
+ 1fc8a95fc9f16d626a09fd8c2bfe98db7e3963e7 14528136 open5gs_2.7.2.4629.7031.202503102026.tar.xz
16
 Checksums-Sha256:
17
- 6991daf5a4aa6b256d5048642752f8c98808848abe572544cd8526e880a75288 14526700 open5gs_2.7.2.4627.ec7c.202503092026.tar.xz
18
+ ac97225730fda3fa35797271358b05494e36dcdf898aea5476cfae603975a642 14528136 open5gs_2.7.2.4629.7031.202503102026.tar.xz
19
 Files:
20
- 9d02e8f1d6d66f5f64635e8b42ba1683 14526700 open5gs_2.7.2.4627.ec7c.202503092026.tar.xz
21
+ 458669c7a4a91232b296d5e0aad0684e 14528136 open5gs_2.7.2.4629.7031.202503102026.tar.xz
22
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/.tarball-version -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/.tarball-version Changed
4
 
1
@@ -1 +1 @@
2
-2.7.2.4627-ec7c.202503092026
3
+2.7.2.4629-7031.202503102026
4
open5gs_2.7.2.4629.7031.202503102026.tar.xz/configs/attach.yaml.in Added
201
 
1
@@ -0,0 +1,335 @@
2
+db_uri: mongodb://localhost/open5gs
3
+
4
+logger:
5
+
6
+test:
7
+  serving:
8
+    - plmn_id:
9
+        mcc: 999
10
+        mnc: 70
11
+
12
+global:
13
+  parameter:
14
+#    no_nrf: true
15
+#    no_scp: true
16
+    no_sepp: true
17
+#    no_amf: true
18
+#    no_smf: true
19
+#    no_upf: true
20
+#    no_ausf: true
21
+#    no_udm: true
22
+#    no_pcf: true
23
+#    no_nssf: true
24
+#    no_bsf: true
25
+#    no_udr: true
26
+#    no_mme: true
27
+#    no_sgwc: true
28
+#    no_sgwu: true
29
+#    no_pcrf: true
30
+#    no_hss: true
31
+
32
+mme:
33
+  freeDiameter:
34
+    identity: mme.localdomain
35
+    realm: localdomain
36
+    listen_on: 127.0.0.2
37
+    no_fwd: true
38
+    load_extension:
39
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
40
+        conf: 0x8888
41
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
42
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
43
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
44
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
45
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
46
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
47
+    connect:
48
+      - identity: hss.localdomain
49
+        address: 127.0.0.8
50
+
51
+  s1ap:
52
+    server:
53
+      - address: 127.0.0.2
54
+  gtpc:
55
+    server:
56
+      - address: 127.0.0.2
57
+    client:
58
+      sgwc:
59
+        - address: 127.0.0.3
60
+      smf:
61
+        - address: 127.0.0.4
62
+  metrics:
63
+    server:
64
+      - address: 127.0.0.2
65
+        port: 9090
66
+  gummei:
67
+    - plmn_id:
68
+        mcc: 999
69
+        mnc: 70
70
+      mme_gid: 2
71
+      mme_code: 1
72
+  tai:
73
+    - plmn_id:
74
+        mcc: 999
75
+        mnc: 70
76
+      tac: 1
77
+  security:
78
+    integrity_order :  EIA2, EIA1, EIA0 
79
+    ciphering_order :  EEA0, EEA1, EEA2 
80
+  network_name:
81
+    full: Open5GS
82
+  time:
83
+    t3412:
84
+      value: 540
85
+
86
+sgwc:
87
+  gtpc:
88
+    server:
89
+      - address: 127.0.0.3
90
+  pfcp:
91
+    server:
92
+      - address: 127.0.0.3
93
+    client:
94
+      sgwu:
95
+        - address: 127.0.0.6
96
+
97
+smf:
98
+#  sbi:
99
+#    server:
100
+#      - address: 127.0.0.4
101
+#        port: 7777
102
+#    client:
103
+#      scp:
104
+#        - uri: http://127.0.0.200:7777
105
+  pfcp:
106
+    server:
107
+      - address: 127.0.0.4
108
+    client:
109
+      upf:
110
+        - address: 127.0.0.7
111
+  gtpc:
112
+    server:
113
+      - address: 127.0.0.4
114
+  gtpu:
115
+    server:
116
+      - address: 127.0.0.4
117
+  metrics:
118
+    server:
119
+      - address: 127.0.0.4
120
+        port: 9090
121
+  session:
122
+    - subnet: 10.45.0.0/16
123
+      gateway: 10.45.0.1
124
+    - subnet: 2001:db8:cafe::/48
125
+      gateway: 2001:db8:cafe::1
126
+  dns:
127
+    - 8.8.8.8
128
+    - 8.8.4.4
129
+    - 2001:4860:4860::8888
130
+    - 2001:4860:4860::8844
131
+  mtu: 1400
132
+  freeDiameter:
133
+    identity: smf.localdomain
134
+    realm: localdomain
135
+    listen_on: 127.0.0.4
136
+    no_fwd: true
137
+    load_extension:
138
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
139
+        conf: 0x8888
140
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
141
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
142
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
143
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
144
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
145
+      - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
146
+    connect:
147
+      - identity: pcrf.localdomain
148
+        address: 127.0.0.9
149
+
150
+amf:
151
+  sbi:
152
+    server:
153
+      - address: 127.0.0.5
154
+        port: 7777
155
+    client:
156
+      scp:
157
+        - uri: http://127.0.0.200:7777
158
+  ngap:
159
+    server:
160
+      - address: 127.0.0.5
161
+  metrics:
162
+    server:
163
+      - address: 127.0.0.5
164
+        port: 9090
165
+  guami:
166
+    - plmn_id:
167
+        mcc: 999
168
+        mnc: 70
169
+      amf_id:
170
+        region: 2
171
+        set: 1
172
+  tai:
173
+    - plmn_id:
174
+        mcc: 999
175
+        mnc: 70
176
+      tac: 1
177
+  plmn_support:
178
+    - plmn_id:
179
+        mcc: 999
180
+        mnc: 70
181
+      s_nssai:
182
+        - sst: 1
183
+  security:
184
+    integrity_order :  NIA2, NIA1, NIA0 
185
+    ciphering_order :  NEA0, NEA1, NEA2 
186
+  network_name:
187
+    full: Open5GS
188
+  amf_name: open5gs-amf0
189
+  time:
190
+    t3512:
191
+      value: 540     # 9 mintues * 60 = 540 seconds
192
+
193
+sgwu:
194
+  pfcp:
195
+    server:
196
+      - address: 127.0.0.6
197
+  gtpu:
198
+    server:
199
+      - address: 127.0.0.6
200
+
201
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/configs/meson.build -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/configs/meson.build Changed
9
 
1
@@ -32,6 +32,7 @@
2
 
3
 example_conf = '''
4
     sample.yaml
5
+    attach.yaml
6
     310014.yaml
7
     csfb.yaml
8
     volte.yaml
9
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/debian/changelog -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/debian/changelog Changed
12
 
1
@@ -1,8 +1,8 @@
2
-open5gs (2.7.2.4627.ec7c.202503092026) unstable; urgency=medium
3
+open5gs (2.7.2.4629.7031.202503102026) unstable; urgency=medium
4
 
5
   * Automatically generated changelog entry for building the Osmocom nightly feed
6
 
7
- -- Osmocom OBS scripts <info@osmocom.org>  Sun, 09 Mar 2025 20:27:54 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org>  Mon, 10 Mar 2025 20:27:55 +0000
9
 
10
 open5gs (2.7.2) unstable; urgency=medium
11
 
12
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/lib/sbi/client.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/lib/sbi/client.c Changed
22
 
1
@@ -649,11 +649,19 @@
2
 static void connection_timer_expired(void *data)
3
 {
4
     connection_t *conn = NULL;
5
+    CURLcode res;
6
+    char *effective_url = NULL;
7
 
8
     conn = data;
9
     ogs_assert(conn);
10
 
11
-    ogs_error("Connection timer expired");
12
+    ogs_error("Connection timer expired METHOD:%s", conn->method);
13
+
14
+    res = curl_easy_getinfo(conn->easy, CURLINFO_EFFECTIVE_URL, &effective_url);
15
+    if ((res == CURLE_OK) && effective_url)
16
+        ogs_error("Effective URL: %s", effective_url);
17
+    else
18
+        ogs_error("curl_easy_getinfo() failed %s", curl_easy_strerror(res));
19
 
20
     ogs_assert(conn->client_cb);
21
     conn->client_cb(OGS_TIMEUP, NULL, conn->data);
22
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/src/mme/emm-build.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/src/mme/emm-build.c Changed
25
 
1
@@ -297,9 +297,10 @@
2
     message.emm.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM;
3
     message.emm.h.message_type = OGS_NAS_EPS_AUTHENTICATION_REQUEST;
4
 
5
-    authentication_request->nas_key_set_identifierasme.tsc = 0;
6
+    authentication_request->nas_key_set_identifierasme.tsc =
7
+        mme_ue->nas_eps.mme.tsc;
8
     authentication_request->nas_key_set_identifierasme.value =
9
-        mme_ue->nas_eps.ksi;
10
+        mme_ue->nas_eps.mme.ksi;
11
     memcpy(authentication_request->authentication_parameter_rand.rand,
12
             mme_ue->rand, OGS_RAND_LEN);
13
     memcpy(authentication_request->authentication_parameter_autn.autn,
14
@@ -355,8 +356,8 @@
15
     selected_nas_security_algorithms->type_of_ciphering_algorithm =
16
         mme_ue->selected_enc_algorithm;
17
 
18
-    nas_key_set_identifier->tsc = 0;
19
-    nas_key_set_identifier->value = 0;
20
+    nas_key_set_identifier->tsc = mme_ue->nas_eps.mme.tsc;
21
+    nas_key_set_identifier->value = mme_ue->nas_eps.mme.ksi;
22
 
23
     replayed_ue_security_capabilities->eea = mme_ue->ue_network_capability.eea;
24
     replayed_ue_security_capabilities->eia = mme_ue->ue_network_capability.eia;
25
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/src/mme/emm-handler.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/src/mme/emm-handler.c Changed
160
 
1
@@ -78,13 +78,26 @@
2
     memcpy(&mme_ue->nas_eps.attach, eps_attach_type,
3
             sizeof(ogs_nas_eps_attach_type_t));
4
     mme_ue->nas_eps.type = MME_EPS_TYPE_ATTACH_REQUEST;
5
-    mme_ue->nas_eps.ksi = eps_attach_type->nas_key_set_identifier;
6
-    ogs_debug("    OGS_NAS_EPS TYPE%d KSI%d",
7
-            mme_ue->nas_eps.type, mme_ue->nas_eps.ksi);
8
-    ogs_debug("    ATTACH TSC%d KSI%d VALUE%d",
9
+
10
+    ogs_debug("    ATTACH TYPE%d TSC%d KSI%d VALUE%d",
11
+            mme_ue->nas_eps.type,
12
             mme_ue->nas_eps.attach.tsc,
13
             mme_ue->nas_eps.attach.nas_key_set_identifier,
14
             mme_ue->nas_eps.attach.value);
15
+
16
+    mme_ue->nas_eps.ue.tsc = eps_attach_type->tsc;
17
+    mme_ue->nas_eps.ue.ksi = eps_attach_type->nas_key_set_identifier;
18
+    ogs_debug("    OLD TSCUE:%d,MME:%d KSIUE:%d,MME:%d",
19
+            mme_ue->nas_eps.ue.tsc, mme_ue->nas_eps.mme.tsc,
20
+            mme_ue->nas_eps.ue.ksi, mme_ue->nas_eps.mme.ksi);
21
+    if (mme_ue->nas_eps.ue.ksi < OGS_NAS_KSI_NO_KEY_IS_AVAILABLE) {
22
+        mme_ue->nas_eps.mme.tsc = mme_ue->nas_eps.ue.tsc;
23
+        mme_ue->nas_eps.mme.ksi = mme_ue->nas_eps.ue.ksi;
24
+    }
25
+    ogs_debug("    NEW TSCUE:%d,MME:%d KSIUE:%d,MME:%d",
26
+            mme_ue->nas_eps.ue.tsc, mme_ue->nas_eps.mme.tsc,
27
+            mme_ue->nas_eps.ue.ksi, mme_ue->nas_eps.mme.ksi);
28
+
29
     switch(mme_ue->nas_eps.attach.value){
30
         case OGS_NAS_ATTACH_TYPE_EPS_ATTACH:
31
             ogs_debug("    Requested EPS_ATTACH_TYPE1, EPS_ATTACH");
32
@@ -99,6 +112,7 @@
33
             ogs_error("    Invalid Requested EPS_ATTACH_TYPE%d",
34
                 mme_ue->nas_eps.attach.value);
35
     }
36
+
37
     /*
38
      * ATTACH_REQUEST
39
      * TAU_REQUEST
40
@@ -457,15 +471,26 @@
41
     mme_ue->nas_eps.type = MME_EPS_TYPE_DETACH_REQUEST_FROM_UE;
42
     mme_ue->detach_type = MME_DETACH_TYPE_REQUEST_FROM_UE;
43
 
44
-    mme_ue->nas_eps.ksi = detach_type->nas_key_set_identifier;
45
-    ogs_debug("    OGS_NAS_EPS TYPE%d KSI%d",
46
-            mme_ue->nas_eps.type, mme_ue->nas_eps.ksi);
47
-    ogs_debug("    DETACH TSC%d KSI%d SWITCH_OFF%d VALUE%d",
48
-            mme_ue->nas_eps.attach.tsc,
49
+    ogs_debug("    DETACH TYPE%d TSC%d KSI%d SWITCH_OFF%d VALUE%d",
50
+            mme_ue->nas_eps.type,
51
+            mme_ue->nas_eps.detach.tsc,
52
             mme_ue->nas_eps.detach.nas_key_set_identifier,
53
             mme_ue->nas_eps.detach.switch_off,
54
             mme_ue->nas_eps.attach.value);
55
 
56
+    mme_ue->nas_eps.ue.tsc = detach_type->tsc;
57
+    mme_ue->nas_eps.ue.ksi = detach_type->nas_key_set_identifier;
58
+    ogs_debug("    OLD TSCUE:%d,MME:%d KSIUE:%d,MME:%d",
59
+            mme_ue->nas_eps.ue.tsc, mme_ue->nas_eps.mme.tsc,
60
+            mme_ue->nas_eps.ue.ksi, mme_ue->nas_eps.mme.ksi);
61
+    if (mme_ue->nas_eps.ue.ksi < OGS_NAS_KSI_NO_KEY_IS_AVAILABLE) {
62
+        mme_ue->nas_eps.mme.tsc = mme_ue->nas_eps.ue.tsc;
63
+        mme_ue->nas_eps.mme.ksi = mme_ue->nas_eps.ue.ksi;
64
+    }
65
+    ogs_debug("    NEW TSCUE:%d,MME:%d KSIUE:%d,MME:%d",
66
+            mme_ue->nas_eps.ue.tsc, mme_ue->nas_eps.mme.tsc,
67
+            mme_ue->nas_eps.ue.ksi, mme_ue->nas_eps.mme.ksi);
68
+
69
     switch (detach_request->detach_type.value) {
70
     /* 0 0 1 : EPS detach */
71
     case OGS_NAS_DETACH_TYPE_FROM_UE_EPS_DETACH:
72
@@ -517,14 +542,24 @@
73
 
74
     /* Set EPS Service */
75
     mme_ue->nas_eps.type = MME_EPS_TYPE_SERVICE_REQUEST;
76
-    mme_ue->nas_eps.ksi = ksi_and_sequence_number->ksi;
77
-    ogs_debug("    OGS_NAS_EPS TYPE%d KSI%d",
78
-            mme_ue->nas_eps.type, mme_ue->nas_eps.ksi);
79
-    ogs_debug("    SERVICE TSC%d KSI%d VALUE%d",
80
+    ogs_debug("    SERVICE TYPE%d TSC%d KSI%d VALUE%d",
81
+            mme_ue->nas_eps.type,
82
             mme_ue->nas_eps.service.tsc,
83
             mme_ue->nas_eps.service.nas_key_set_identifier,
84
             mme_ue->nas_eps.service.value);
85
 
86
+    mme_ue->nas_eps.ue.ksi = ksi_and_sequence_number->ksi;
87
+    ogs_debug("    OLD TSCUE:%d,MME:%d KSIUE:%d,MME:%d",
88
+            mme_ue->nas_eps.ue.tsc, mme_ue->nas_eps.mme.tsc,
89
+            mme_ue->nas_eps.ue.ksi, mme_ue->nas_eps.mme.ksi);
90
+    if (mme_ue->nas_eps.ue.ksi < OGS_NAS_KSI_NO_KEY_IS_AVAILABLE) {
91
+        mme_ue->nas_eps.mme.tsc = mme_ue->nas_eps.ue.tsc;
92
+        mme_ue->nas_eps.mme.ksi = mme_ue->nas_eps.ue.ksi;
93
+    }
94
+    ogs_debug("    NEW TSCUE:%d,MME:%d KSIUE:%d,MME:%d",
95
+            mme_ue->nas_eps.ue.tsc, mme_ue->nas_eps.mme.tsc,
96
+            mme_ue->nas_eps.ue.ksi, mme_ue->nas_eps.mme.ksi);
97
+
98
     /*
99
      * ATTACH_REQUEST
100
      * TAU_REQUEST
101
@@ -609,15 +644,26 @@
102
     memcpy(&mme_ue->nas_eps.update, eps_update_type,
103
             sizeof(ogs_nas_eps_update_type_t));
104
     mme_ue->nas_eps.type = MME_EPS_TYPE_TAU_REQUEST;
105
-    mme_ue->nas_eps.ksi = eps_update_type->nas_key_set_identifier;
106
-    ogs_debug("    OGS_NAS_EPS TYPE%d KSI%d",
107
-            mme_ue->nas_eps.type, mme_ue->nas_eps.ksi);
108
-    ogs_debug("    UPDATE TSC%d KSI%d Active-flag%d VALUE%d",
109
+    ogs_debug("    UPDATE TYPE%d TSC%d KSI%d Active-flag%d VALUE%d",
110
+            mme_ue->nas_eps.type,
111
             mme_ue->nas_eps.update.tsc,
112
             mme_ue->nas_eps.update.nas_key_set_identifier,
113
             mme_ue->nas_eps.update.active_flag,
114
             mme_ue->nas_eps.update.value);
115
 
116
+    mme_ue->nas_eps.ue.tsc = eps_update_type->tsc;
117
+    mme_ue->nas_eps.ue.ksi = eps_update_type->nas_key_set_identifier;
118
+    ogs_debug("    OLD TSCUE:%d,MME:%d KSIUE:%d,MME:%d",
119
+            mme_ue->nas_eps.ue.tsc, mme_ue->nas_eps.mme.tsc,
120
+            mme_ue->nas_eps.ue.ksi, mme_ue->nas_eps.mme.ksi);
121
+    if (mme_ue->nas_eps.ue.ksi < OGS_NAS_KSI_NO_KEY_IS_AVAILABLE) {
122
+        mme_ue->nas_eps.mme.tsc = mme_ue->nas_eps.ue.tsc;
123
+        mme_ue->nas_eps.mme.ksi = mme_ue->nas_eps.ue.ksi;
124
+    }
125
+    ogs_debug("    NEW TSCUE:%d,MME:%d KSIUE:%d,MME:%d",
126
+            mme_ue->nas_eps.ue.tsc, mme_ue->nas_eps.mme.tsc,
127
+            mme_ue->nas_eps.ue.ksi, mme_ue->nas_eps.mme.ksi);
128
+
129
     /*
130
      * ATTACH_REQUEST
131
      * TAU_REQUEST
132
@@ -756,9 +802,24 @@
133
     memcpy(&mme_ue->nas_eps.service, service_type,
134
             sizeof(ogs_nas_service_type_t));
135
     mme_ue->nas_eps.type = MME_EPS_TYPE_EXTENDED_SERVICE_REQUEST;
136
-    mme_ue->nas_eps.ksi = service_type->nas_key_set_identifier;
137
-    ogs_debug("    OGS_NAS_EPS TYPE%d KSI%d",
138
-            mme_ue->nas_eps.type, mme_ue->nas_eps.ksi);
139
+    ogs_debug("    Extended SERVICE TYPE%d TSC%d KSI%d VALUE%d",
140
+            mme_ue->nas_eps.type,
141
+            mme_ue->nas_eps.service.tsc,
142
+            mme_ue->nas_eps.service.nas_key_set_identifier,
143
+            mme_ue->nas_eps.service.value);
144
+
145
+    mme_ue->nas_eps.ue.tsc = service_type->tsc;
146
+    mme_ue->nas_eps.ue.ksi = service_type->nas_key_set_identifier;
147
+    ogs_debug("    OLD TSCUE:%d,MME:%d KSIUE:%d,MME:%d",
148
+            mme_ue->nas_eps.ue.tsc, mme_ue->nas_eps.mme.tsc,
149
+            mme_ue->nas_eps.ue.ksi, mme_ue->nas_eps.mme.ksi);
150
+    if (mme_ue->nas_eps.ue.ksi < OGS_NAS_KSI_NO_KEY_IS_AVAILABLE) {
151
+        mme_ue->nas_eps.mme.tsc = mme_ue->nas_eps.ue.tsc;
152
+        mme_ue->nas_eps.mme.ksi = mme_ue->nas_eps.ue.ksi;
153
+    }
154
+    ogs_debug("    NEW TSCUE:%d,MME:%d KSIUE:%d,MME:%d",
155
+            mme_ue->nas_eps.ue.tsc, mme_ue->nas_eps.mme.tsc,
156
+            mme_ue->nas_eps.ue.ksi, mme_ue->nas_eps.mme.ksi);
157
 
158
     /*
159
      * ATTACH_REQUEST
160
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/src/mme/mme-context.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/src/mme/mme-context.c Changed
11
 
1
@@ -3617,6 +3617,9 @@
2
     mme_ue->csmap = NULL;
3
     mme_ue->vlr_ostream_id = 0;
4
 
5
+    /* Initialization */
6
+    mme_ue->nas_eps.mme.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
7
+
8
     mme_ue_fsm_init(mme_ue);
9
 
10
     ogs_list_add(&self.mme_ue_list, mme_ue);
11
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/src/mme/mme-context.h -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/src/mme/mme-context.h Changed
31
 
1
@@ -355,7 +355,13 @@
2
 #define MME_EPS_TYPE_DETACH_REQUEST_FROM_UE         5
3
 #define MME_EPS_TYPE_DETACH_REQUEST_TO_UE           6
4
         uint8_t     type;
5
-        uint8_t     ksi;
6
+
7
+        struct {
8
+        ED3(uint8_t tsc:1;,
9
+            uint8_t ksi:3;,
10
+            uint8_t spare:4;)
11
+        } mme, ue;
12
+
13
         ogs_nas_eps_attach_type_t attach;
14
         ogs_nas_eps_update_type_t update;
15
         ogs_nas_service_type_t service;
16
@@ -446,13 +452,12 @@
17
     ((__mME) && \
18
     ((__mME)->security_context_available == 1) && \
19
      ((__mME)->mac_failed == 0) && \
20
-     ((__mME)->nas_eps.ksi != OGS_NAS_KSI_NO_KEY_IS_AVAILABLE))
21
+     ((__mME)->nas_eps.ue.ksi != OGS_NAS_KSI_NO_KEY_IS_AVAILABLE))
22
 #define CLEAR_SECURITY_CONTEXT(__mME) \
23
     do { \
24
         ogs_assert((__mME)); \
25
         (__mME)->security_context_available = 0; \
26
         (__mME)->mac_failed = 0; \
27
-        (__mME)->nas_eps.ksi = 0; \
28
     } while(0)
29
     int             security_context_available;
30
     int             mac_failed;
31
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/src/mme/mme-gn-build.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/src/mme/mme-gn-build.c Changed
10
 
1
@@ -32,7 +32,7 @@
2
     *mmctx_dec = (ogs_gtp1_mm_context_decoded_t) {
3
         .gupii = 1, /* Integrity Protection not required */
4
         .ugipai = 1, /* Ignore "Used GPRS integrity protection algorithm" field" */
5
-        .ksi = mme_ue->nas_eps.ksi,
6
+        .ksi = mme_ue->nas_eps.mme.ksi,
7
         .sec_mode = OGS_GTP1_SEC_MODE_UMTS_KEY_AND_QUINTUPLETS,
8
         .num_vectors = 0, /* TODO: figure out how to fill the quintuplets */
9
         .drx_param = {
10
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/src/mme/mme-gn-handler.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/src/mme/mme-gn-handler.c Changed
10
 
1
@@ -407,7 +407,7 @@
2
              ogs_min(gtp1_mm_ctx.ms_network_capability_len, sizeof(mme_ue->ms_network_capability) - 1));
3
     /* TODO: how to fill first byte of mme_ue->ms_network_capability ? */
4
 
5
-    mme_ue->nas_eps.ksi = gtp1_mm_ctx.ksi;
6
+    mme_ue->nas_eps.mme.ksi = gtp1_mm_ctx.ksi;
7
     /* 3GPP TS 33.401 A.10, A.11: */
8
     mme_ue->noncemme = ogs_random32();
9
     /* 3GPP TS 33.401 7.2.6.2 Establishment of keys for cryptographically protected radio bearers: */
10
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/src/mme/mme-s6a-handler.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/src/mme/mme-s6a-handler.c Changed
16
 
1
@@ -63,8 +63,12 @@
2
 
3
     CLEAR_MME_UE_TIMER(mme_ue->t3460);
4
 
5
-    if (mme_ue->nas_eps.ksi == OGS_NAS_KSI_NO_KEY_IS_AVAILABLE)
6
-        mme_ue->nas_eps.ksi = 0;
7
+    if (mme_ue->nas_eps.mme.ksi < (OGS_NAS_KSI_NO_KEY_IS_AVAILABLE - 1))
8
+        mme_ue->nas_eps.mme.ksi++;
9
+    else
10
+        mme_ue->nas_eps.mme.ksi = 0;
11
+
12
+    mme_ue->nas_eps.ue.ksi = mme_ue->nas_eps.mme.ksi;
13
 
14
     return OGS_NAS_EMM_CAUSE_REQUEST_ACCEPTED;
15
 }
16
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/tests/attach/abts-main.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/tests/attach/abts-main.c Changed
10
 
1
@@ -75,7 +75,7 @@
2
     abts_suite *suite = NULL;
3
 
4
     atexit(terminate);
5
-    test_app_run(argc, argv, "sample.yaml", initialize);
6
+    test_app_run(argc, argv, "attach.yaml", initialize);
7
 
8
     for (i = 0; alltestsi.func; i++)
9
         suite = alltestsi.func(suite);
10
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/tests/attach/crash-test.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/tests/attach/crash-test.c Changed
10
 
1
@@ -140,7 +140,7 @@
2
     ogs_assert(test_ue);
3
 
4
     test_ue->e_cgi.cell_id = 0x1079baf0;
5
-    test_ue->nas.ksi = 0;
6
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
7
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
8
 
9
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
10
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/tests/attach/guti-test.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/tests/attach/guti-test.c Changed
19
 
1
@@ -56,7 +56,7 @@
2
     ogs_assert(test_ue);
3
 
4
     test_ue->e_cgi.cell_id = 0x1079baf0;
5
-    test_ue->nas.ksi = 0;
6
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
7
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
8
 
9
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
10
@@ -1275,7 +1275,7 @@
11
     ogs_assert(test_ue);
12
 
13
     test_ue->e_cgi.cell_id = 0x64010;
14
-    test_ue->nas.ksi = 0;
15
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
16
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_EPS_ATTACH;
17
 
18
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
19
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/tests/attach/issues-test.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/tests/attach/issues-test.c Changed
10
 
1
@@ -1911,7 +1911,7 @@
2
     ogs_assert(test_ue);
3
 
4
     test_ue->e_cgi.cell_id = 0x1079baf0;
5
-    test_ue->nas.ksi = 0;
6
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
7
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
8
 
9
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
10
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/tests/attach/simple-test.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/tests/attach/simple-test.c Changed
10
 
1
@@ -56,7 +56,7 @@
2
     ogs_assert(test_ue);
3
 
4
     test_ue->e_cgi.cell_id = 0x1079baf0;
5
-    test_ue->nas.ksi = 0;
6
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
7
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
8
 
9
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
10
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/tests/attach/ue-context-test.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/tests/attach/ue-context-test.c Changed
19
 
1
@@ -217,7 +217,7 @@
2
     ogs_assert(test_ue);
3
 
4
     test_ue->e_cgi.cell_id = 0x64010;
5
-    test_ue->nas.ksi = 0;
6
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
7
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_EPS_ATTACH;
8
 
9
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
10
@@ -518,7 +518,7 @@
11
     ogs_assert(test_ue);
12
 
13
     test_ue->e_cgi.cell_id = 0x64010;
14
-    test_ue->nas.ksi = 0;
15
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
16
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_EPS_ATTACH;
17
 
18
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
19
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/tests/non3gpp/epdg-test.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/tests/non3gpp/epdg-test.c Changed
28
 
1
@@ -63,7 +63,7 @@
2
     ogs_assert(test_ue);
3
 
4
     test_ue->e_cgi.cell_id = 0x1079baf;
5
-    test_ue->nas.ksi = 0;
6
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
7
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
8
 
9
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
10
@@ -204,7 +204,7 @@
11
     ogs_assert(test_ue);
12
 
13
     test_ue->e_cgi.cell_id = 0x1079baf;
14
-    test_ue->nas.ksi = 0;
15
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
16
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
17
 
18
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
19
@@ -350,7 +350,7 @@
20
     ogs_assert(test_ue);
21
 
22
     test_ue->e_cgi.cell_id = 0x1079baf;
23
-    test_ue->nas.ksi = 0;
24
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
25
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
26
 
27
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
28
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/tests/volte/bearer-test.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/tests/volte/bearer-test.c Changed
19
 
1
@@ -53,7 +53,7 @@
2
     ogs_assert(test_ue);
3
 
4
     test_ue->e_cgi.cell_id = 0x1079baf;
5
-    test_ue->nas.ksi = 0;
6
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
7
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
8
 
9
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
10
@@ -297,7 +297,7 @@
11
     ogs_assert(test_ue);
12
 
13
     test_ue->e_cgi.cell_id = 0x1079baf;
14
-    test_ue->nas.ksi = 0;
15
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
16
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
17
 
18
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
19
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/tests/volte/rx-test.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/tests/volte/rx-test.c Changed
82
 
1
@@ -59,7 +59,7 @@
2
     ogs_assert(test_ue);
3
 
4
     test_ue->e_cgi.cell_id = 0x1079baf;
5
-    test_ue->nas.ksi = 0;
6
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
7
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
8
 
9
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
10
@@ -571,7 +571,7 @@
11
     ogs_assert(test_ue);
12
 
13
     test_ue->e_cgi.cell_id = 0x1079baf;
14
-    test_ue->nas.ksi = 0;
15
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
16
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
17
 
18
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
19
@@ -922,7 +922,7 @@
20
     ogs_assert(test_ue);
21
 
22
     test_ue->e_cgi.cell_id = 0x1079baf;
23
-    test_ue->nas.ksi = 0;
24
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
25
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
26
 
27
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
28
@@ -1270,7 +1270,7 @@
29
     ogs_assert(test_ue);
30
 
31
     test_ue->e_cgi.cell_id = 0x1079baf;
32
-    test_ue->nas.ksi = 0;
33
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
34
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
35
 
36
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
37
@@ -1798,7 +1798,7 @@
38
     ogs_assert(test_ue);
39
 
40
     test_ue->e_cgi.cell_id = 0x1079baf;
41
-    test_ue->nas.ksi = 0;
42
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
43
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
44
 
45
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
46
@@ -2301,7 +2301,7 @@
47
     ogs_assert(test_ue);
48
 
49
     test_ue->e_cgi.cell_id = 0x1079baf;
50
-    test_ue->nas.ksi = 0;
51
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
52
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
53
 
54
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
55
@@ -2723,7 +2723,7 @@
56
     ogs_assert(test_ue);
57
 
58
     test_ue->e_cgi.cell_id = 0x1079baf;
59
-    test_ue->nas.ksi = 0;
60
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
61
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
62
 
63
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
64
@@ -3125,7 +3125,7 @@
65
     ogs_assert(test_ue);
66
 
67
     test_ue->e_cgi.cell_id = 0x1079baf;
68
-    test_ue->nas.ksi = 0;
69
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
70
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
71
 
72
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
73
@@ -3449,7 +3449,7 @@
74
     ogs_assert(test_ue);
75
 
76
     test_ue->e_cgi.cell_id = 0x1079baf;
77
-    test_ue->nas.ksi = 0;
78
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
79
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
80
 
81
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
82
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/tests/volte/session-test.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/tests/volte/session-test.c Changed
10
 
1
@@ -53,7 +53,7 @@
2
     ogs_assert(test_ue);
3
 
4
     test_ue->e_cgi.cell_id = 0x1079baf;
5
-    test_ue->nas.ksi = 0;
6
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
7
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
8
 
9
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
10
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/tests/volte/simple-test.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/tests/volte/simple-test.c Changed
10
 
1
@@ -59,7 +59,7 @@
2
     ogs_assert(test_ue);
3
 
4
     test_ue->e_cgi.cell_id = 0x1079baf;
5
-    test_ue->nas.ksi = 0;
6
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
7
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
8
 
9
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
10
open5gs_2.7.2.4627.ec7c.202503092026.tar.xz/tests/volte/video-test.c -> open5gs_2.7.2.4629.7031.202503102026.tar.xz/tests/volte/video-test.c Changed
10
 
1
@@ -57,7 +57,7 @@
2
     ogs_assert(test_ue);
3
 
4
     test_ue->e_cgi.cell_id = 0x1079baf;
5
-    test_ue->nas.ksi = 0;
6
+    test_ue->nas.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
7
     test_ue->nas.value = OGS_NAS_ATTACH_TYPE_COMBINED_EPS_IMSI_ATTACH;
8
 
9
     test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
10