Osmocom Open Build Service

open5gs_2.7.5.4706.fc38.202507182026.dsc -> open5gs_2.7.6.4730.0516.202507192026.dsc Changed

@@ -2,7 +2,7 @@
 Source: open5gs
 Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
 Architecture: any
-Version: 2.7.5.4706.fc38.202507182026
+Version: 2.7.6.4730.0516.202507192026
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Uploaders: Sukchan Lee <acetcom@gmail.com>
 Homepage: https://open5gs.org
@@ -32,8 +32,8 @@
  open5gs-udr deb net optional arch=any
  open5gs-upf deb net optional arch=any
 Checksums-Sha1:
- ec581285fd0ec77a36e8ab90d09758d25951c6a5 14541176 open5gs_2.7.5.4706.fc38.202507182026.tar.xz
+ 312f8f1fd4444464c45e30698c160cdd9c449bf0 15023208 open5gs_2.7.6.4730.0516.202507192026.tar.xz
 Checksums-Sha256:
- 4afc5ad839e3460b8a1af0ac5532a739f9c09618ba1f14721242ef5dcf800900 14541176 open5gs_2.7.5.4706.fc38.202507182026.tar.xz
+ aaf1dfe3ac26bdc7f0f991e1c9258ff23dace79553d5a03a85d844b2a96c8566 15023208 open5gs_2.7.6.4730.0516.202507192026.tar.xz
 Files:
- 8efe1604d7032ced0d978dd92cba1904 14541176 open5gs_2.7.5.4706.fc38.202507182026.tar.xz
+ 4bd13df94b6cece39ca4cdcc7ccb8f87 15023208 open5gs_2.7.6.4730.0516.202507192026.tar.xz

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/.tarball-version -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/.tarball-version Changed

open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/5gc-no-scp-sepp1-999-70.yaml.in Added

@@ -0,0 +1,530 @@
+db_uri: mongodb://localhost/open5gs
+
+logger:
+
+global:
+  parameter:
+#    no_nrf: true
+    no_scp: true
+#    no_sepp: 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
+
+mme:
+  freeDiameter:
+    identity: mme.localdomain
+    realm: localdomain
+    listen_on: 127.0.1.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
+        address: 127.0.1.8
+
+  s1ap:
+    server:
+      - address: 127.0.1.2
+  gtpc:
+    server:
+      - address: 127.0.1.2
+    client:
+      sgwc:
+        - address: 127.0.1.3
+      smf:
+        - address: 127.0.1.4
+  metrics:
+    server:
+      - address: 127.0.1.2
+        port: 9090
+  gummei:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+      mme_gid: 2
+      mme_code: 1
+  tai:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+      tac: 1
+  security:
+    integrity_order :  EIA2, EIA1, EIA0 
+    ciphering_order :  EEA0, EEA1, EEA2 
+  network_name:
+    full: Open5GS
+  time:
+    t3412:
+      value: 3240
+
+sgwc:
+  gtpc:
+    server:
+      - address: 127.0.1.3
+  pfcp:
+    server:
+      - address: 127.0.1.3
+    client:
+      sgwu:
+        - address: 127.0.1.6
+
+smf:
+  sbi:
+    server:
+#      - address: 127.0.1.4
+#        port: 7777
+      - address: smf.5gc.mnc070.mcc999.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+  pfcp:
+    server:
+      - address: 127.0.1.4
+    client:
+      upf:
+        - address: 127.0.1.7
+  gtpc:
+    server:
+      - address: 127.0.1.4
+  gtpu:
+    server:
+      - address: 127.0.1.4
+  metrics:
+    server:
+      - address: 127.0.1.4
+        port: 9090
+  session:
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
+      gateway: 2001:db8:cafe::1
+  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.1.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
+        address: 127.0.1.9
+
+amf:
+  sbi:
+    server:
+      - address: 127.0.1.5
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc070.mcc999.3gppnetwork.org
+  ngap:
+    server:
+      - address: 127.0.1.5
+  metrics:
+    server:
+      - address: 127.0.1.5
+        port: 9090
+  access_control:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+  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
+  time:
+    t3512:
+      value: 540     # 9 mintues * 60 = 540 seconds
+
+sgwu:
+  pfcp:
+    server:

open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/5gc-no-scp-sepp2-001-01.yaml.in Added

@@ -0,0 +1,532 @@
+db_uri: mongodb://localhost/open5gs
+
+logger:
+
+global:
+  parameter:
+#    no_nrf: true
+    no_scp: true
+#    no_sepp: 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
+
+mme:
+  freeDiameter:
+    identity: mme.localdomain
+    realm: localdomain
+    listen_on: 127.0.2.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
+        address: 127.0.2.8
+
+  s1ap:
+    server:
+      - address: 127.0.2.2
+  gtpc:
+    server:
+      - address: 127.0.2.2
+    client:
+      sgwc:
+        - address: 127.0.2.3
+      smf:
+        - address: 127.0.2.4
+  metrics:
+    server:
+      - address: 127.0.2.2
+        port: 9090
+  gummei:
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+      mme_gid: 2
+      mme_code: 1
+  tai:
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+      tac: 1
+  security:
+    integrity_order :  EIA2, EIA1, EIA0 
+    ciphering_order :  EEA0, EEA1, EEA2 
+  network_name:
+    full: Open5GS
+  time:
+    t3412:
+      value: 3240
+
+sgwc:
+  gtpc:
+    server:
+      - address: 127.0.2.3
+  pfcp:
+    server:
+      - address: 127.0.2.3
+    client:
+      sgwu:
+        - address: 127.0.2.6
+
+smf:
+  sbi:
+    server:
+#      - address: 127.0.2.4
+#        port: 7777
+      - address: smf.5gc.mnc001.mcc001.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc001.mcc001.3gppnetwork.org
+  pfcp:
+    server:
+      - address: 127.0.2.4
+    client:
+      upf:
+        - address: 127.0.2.7
+  gtpc:
+    server:
+      - address: 127.0.2.4
+  gtpu:
+    server:
+      - address: 127.0.2.4
+  metrics:
+    server:
+      - address: 127.0.2.4
+        port: 9090
+  session:
+    - subnet: 10.46.0.0/16
+      gateway: 10.46.0.1
+    - subnet: 2001:db8:babe::/48
+      gateway: 2001:db8:babe::1
+  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.2.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
+        address: 127.0.2.9
+
+amf:
+  sbi:
+    server:
+      - address: 127.0.2.5
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc001.mcc001.3gppnetwork.org
+  ngap:
+    server:
+      - address: 127.0.2.5
+  metrics:
+    server:
+      - address: 127.0.2.5
+        port: 9090
+  access_control:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+  guami:
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+      amf_id:
+        region: 2
+        set: 1
+  tai:
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+      tac: 1
+  plmn_support:
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+      s_nssai:
+        - sst: 1
+  security:
+    integrity_order :  NIA2, NIA1, NIA0 
+    ciphering_order :  NEA0, NEA1, NEA2 
+  network_name:
+    full: Open5GS
+  amf_name: open5gs-amf0
+  time:
+    t3512:
+      value: 540     # 9 mintues * 60 = 540 seconds
+
+sgwu:
+  pfcp:
+    server:

open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/5gc-no-scp-sepp3-315-010.yaml.in Added

@@ -0,0 +1,532 @@
+db_uri: mongodb://localhost/open5gs
+
+logger:
+
+global:
+  parameter:
+#    no_nrf: true
+    no_scp: true
+#    no_sepp: 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
+
+mme:
+  freeDiameter:
+    identity: mme.localdomain
+    realm: localdomain
+    listen_on: 127.0.3.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
+        address: 127.0.3.8
+
+  s1ap:
+    server:
+      - address: 127.0.3.2
+  gtpc:
+    server:
+      - address: 127.0.3.2
+    client:
+      sgwc:
+        - address: 127.0.3.3
+      smf:
+        - address: 127.0.3.4
+  metrics:
+    server:
+      - address: 127.0.3.2
+        port: 9090
+  gummei:
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+      mme_gid: 2
+      mme_code: 1
+  tai:
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+      tac: 1
+  security:
+    integrity_order :  EIA2, EIA1, EIA0 
+    ciphering_order :  EEA0, EEA1, EEA2 
+  network_name:
+    full: Open5GS
+  time:
+    t3412:
+      value: 3240
+
+sgwc:
+  gtpc:
+    server:
+      - address: 127.0.3.3
+  pfcp:
+    server:
+      - address: 127.0.3.3
+    client:
+      sgwu:
+        - address: 127.0.3.6
+
+smf:
+  sbi:
+    server:
+#      - address: 127.0.3.4
+#        port: 7777
+      - address: smf.5gc.mnc010.mcc315.3gppnetwork.org
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc010.mcc315.3gppnetwork.org
+  pfcp:
+    server:
+      - address: 127.0.3.4
+    client:
+      upf:
+        - address: 127.0.3.7
+  gtpc:
+    server:
+      - address: 127.0.3.4
+  gtpu:
+    server:
+      - address: 127.0.3.4
+  metrics:
+    server:
+      - address: 127.0.3.4
+        port: 9090
+  session:
+    - subnet: 10.47.0.0/16
+      gateway: 10.47.0.1
+    - subnet: 2001:db8:face::/48
+      gateway: 2001:db8:face::1
+  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.3.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
+        address: 127.0.3.9
+
+amf:
+  sbi:
+    server:
+      - address: 127.0.3.5
+        port: 7777
+    client:
+      nrf:
+        - uri: http://nrf.5gc.mnc010.mcc315.3gppnetwork.org
+  ngap:
+    server:
+      - address: 127.0.3.5
+  metrics:
+    server:
+      - address: 127.0.3.5
+        port: 9090
+  access_control:
+    - plmn_id:
+        mcc: 999
+        mnc: 70
+    - plmn_id:
+        mcc: 001
+        mnc: 01
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+  guami:
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+      amf_id:
+        region: 2
+        set: 1
+  tai:
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+      tac: 1
+  plmn_support:
+    - plmn_id:
+        mcc: 315
+        mnc: 010
+      s_nssai:
+        - sst: 1
+  security:
+    integrity_order :  NIA2, NIA1, NIA0 
+    ciphering_order :  NEA0, NEA1, NEA2 
+  network_name:
+    full: Open5GS
+  amf_name: open5gs-amf0
+  time:
+    t3512:
+      value: 540     # 9 mintues * 60 = 540 seconds
+
+sgwu:
+  pfcp:
+    server:

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/5gc-sepp1-999-70.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/5gc-sepp1-999-70.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/5gc-sepp2-001-01.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/5gc-sepp2-001-01.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/5gc-sepp3-315-010.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/5gc-sepp3-315-010.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/5gc-tls-sepp1-999-70.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/5gc-tls-sepp1-999-70.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/5gc-tls-sepp2-001-01.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/5gc-tls-sepp2-001-01.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/5gc-tls-sepp3-315-010.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/5gc-tls-sepp3-315-010.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/gnb-001-01-ue-001-01.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/gnb-001-01-ue-001-01.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/gnb-001-01-ue-315-010.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/gnb-001-01-ue-315-010.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/gnb-001-01-ue-999-70.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/gnb-001-01-ue-999-70.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/gnb-315-010-ue-001-01.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/gnb-315-010-ue-001-01.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/gnb-315-010-ue-315-010.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/gnb-315-010-ue-315-010.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/gnb-315-010-ue-999-70.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/gnb-315-010-ue-999-70.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/gnb-999-70-ue-001-01.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/gnb-999-70-ue-001-01.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/gnb-999-70-ue-315-010.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/gnb-999-70-ue-315-010.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/gnb-999-70-ue-999-70.yaml.in -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/gnb-999-70-ue-999-70.yaml.in Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/configs/examples/meson.build -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/configs/examples/meson.build Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/debian/changelog -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/debian/changelog Changed

@@ -1,8 +1,50 @@
-open5gs (2.7.5.4706.fc38.202507182026) unstable; urgency=medium
+open5gs (2.7.6.4730.0516.202507192026) unstable; urgency=medium
 
   * Automatically generated changelog entry for building the Osmocom nightly feed
 
- -- Osmocom OBS scripts <info@osmocom.org>  Fri, 18 Jul 2025 20:27:53 +0000
+ -- Osmocom OBS scripts <info@osmocom.org>  Sat, 19 Jul 2025 20:27:54 +0000
+
+open5gs (2.7.6) unstable; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 10:02:38 +0900
+
+open5gs (2.7.6~plucky) plucky; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 09:59:50 +0900
+
+open5gs (2.7.6~oracular) oracular; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 09:57:14 +0900
+
+open5gs (2.7.6~noble) noble; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 09:55:32 +0900
+
+open5gs (2.7.6~jammy) jammy; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 09:53:39 +0900
+
+open5gs (2.7.6~focal) focal; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 09:51:57 +0900
+
+open5gs (2.7.6~bionic) bionic; urgency=medium
+
+  * Bug Fixed
+
+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 19 Jul 2025 09:49:35 +0900
 
 open5gs (2.7.5) unstable; urgency=medium

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/docs/_config.yml -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/docs/_config.yml Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/docs/_docs/tutorial/05-roaming.md -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/docs/_docs/tutorial/05-roaming.md Changed

@@ -4,10 +4,9 @@
 
 ## 0. Introduction
 
-Now, we will explain how to install and test 5G Core Roaming using Open5GS. Since we cannot test roaming with UERANSIM, we will use the test environment of Open5GS. 
-
-We can only use the LBO method. HR roaming will be implemented at a later date. And also, 5G roaming has been implemented according to the document below.
+This document explains how to install and test 5G Core Roaming using Open5GS. Since roaming cannot be tested with UERANSIM, we use Open5GS's built-in test environment.
 
+Open5GS supports both LBO (Local Breakout) and HR (Home Routed) roaming methods. The 5G roaming implementation follows the specifications outlined in the document below:
 ```
 TS29.500
 6 General Functionalities in Service Based Architecture
@@ -15,7 +14,7 @@
 6.1.4.3 Routing across PLMN
 ```
 
-Let's start the explanation assuming that the connection test of the UE to this single host has been completed.
+This explanation assumes that you have already completed the UE connection test on a single host.
 
 ## 1. Your First Roaming with Test Program
 
@@ -29,36 +28,43 @@
 $ ninja -C build install
 ```
 
-#### Configure FQDN to DNS
+#### Configure DNS for FQDN Resolution
 
-For routing to Home PLMN, NRF, AUSF and UDM address in H-PLMN shall use FQDN format, so please edit the /etc/hosts file as follows.
+For routing to the Home PLMN, the NRF, AUSF, and UDM addresses in H-PLMN must use FQDN format. Additionally, for HR roaming, NSSF, SMF, and BSF must also use FQDN format. Please edit the /etc/hosts file as follows:
 
 ```diff
-$ diff -u hosts.old hosts.new
---- hosts.old	2023-10-02 11:58:54.261154726 +0900
-+++ hosts.new	2023-10-02 11:59:02.868771248 +0900
-@@ -1,6 +1,18 @@
+--- hosts	2025-07-15 08:33:36.594334895 +0900
++++ /etc/hosts	2025-07-15 08:46:53.727356793 +0900
+@@ -1,6 +1,27 @@
  127.0.0.1	localhost
  127.0.1.1	open5gs
 
 +127.0.1.10	nrf.5gc.mnc070.mcc999.3gppnetwork.org
 +127.0.1.11	ausf.5gc.mnc070.mcc999.3gppnetwork.org
 +127.0.1.12	udm.5gc.mnc070.mcc999.3gppnetwork.org
++127.0.1.14	nssf.5gc.mnc070.mcc999.3gppnetwork.org
++127.0.1.4	smf.5gc.mnc070.mcc999.3gppnetwork.org
++127.0.1.15	bsf.5gc.mnc070.mcc999.3gppnetwork.org
 +
 +127.0.2.10	nrf.5gc.mnc001.mcc001.3gppnetwork.org
 +127.0.2.11	ausf.5gc.mnc001.mcc001.3gppnetwork.org
 +127.0.2.12	udm.5gc.mnc001.mcc001.3gppnetwork.org
++127.0.2.14	nssf.5gc.mnc001.mcc001.3gppnetwork.org
++127.0.2.4	smf.5gc.mnc001.mcc001.3gppnetwork.org
++127.0.2.15	baf.5gc.mnc001.mcc001.3gppnetwork.org
 +
 +127.0.3.10	nrf.5gc.mnc010.mcc315.3gppnetwork.org
 +127.0.3.11	ausf.5gc.mnc010.mcc315.3gppnetwork.org
 +127.0.3.12	udm.5gc.mnc010.mcc315.3gppnetwork.org
++127.0.3.14	nssf.5gc.mnc010.mcc315.3gppnetwork.org
++127.0.3.4	smf.5gc.mnc010.mcc315.3gppnetwork.org
++127.0.3.15	bsf.5gc.mnc010.mcc315.3gppnetwork.org
 +
  # The following lines are desirable for IPv6 capable hosts
  ::1     ip6-localhost ip6-loopback
  fe00::0 ip6-localnet
 ```
 
-
 #### Run the V-PLMN 5G Core and H-PLMN 5G Core on a single host
 
 5G Core requires root privileges as it uses reserved ports such as http(80) or https(443).
@@ -69,7 +75,7 @@
 $ sudo ./build/tests/app/5gc -c ./build/configs/examples/5gc-sepp3-315-010.yaml
 ```
 
-Performs a test of UE access while roaming subscribed to H-PLMN.
+Test UE access while roaming with UEs subscribed to different H-PLMNs. The same test commands work for both LBO and HR roaming scenarios - the roaming type is determined by the network configuration and policies:
 ```
 $ ./build/tests/registration/registration -c ./build/configs/examples/gnb-999-70-ue-001-01.yaml simple-test
 $ ./build/tests/registration/registration -c ./build/configs/examples/gnb-999-70-ue-315-010.yaml simple-test
@@ -79,15 +85,30 @@
 $ ./build/tests/registration/registration -c ./build/configs/examples/gnb-315-010-ue-001-01.yaml simple-test
 ```
 
-You can see the sample traffic.  -- 5g-roaming-lbo.pcapng({{ site.url }}{{ site.baseurl }}/assets/pcapng/5g_roaming_lbo.pcapng).
+You can see the sample traffic for both roaming types:
+- LBO Roaming: 5g-roaming-lbo.pcapng({{ site.url }}{{ site.baseurl }}/assets/pcapng/5g-roaming-lbo.pcapng)
+- HR Roaming: 5g-roaming-hr.pcapng({{ site.url }}{{ site.baseurl }}/assets/pcapng/5g-roaming-hr.pcapng)
+
 
 ## 2. Roaming Test on a Single Host
 
+Open5GS now supports both roaming architectures:
+
+1. **LBO (Local Breakout)**: User plane traffic is routed locally through the visited network's UPF
+2. **HR (Home Routed)**: User plane traffic is routed back to the home network's UPF through the visited network
+
+The choice between LBO and HR is determined by subscriber configuration and roaming agreements. In Open5GS WebUI, you can configure the roaming type for each subscriber session using the `lbo_roaming_allowed` parameter:
+
+- **LBO Roaming**: Set `Subscriber.slice.session.lbo_roaming_allowed` to `true`
+- **HR Roaming**: Set `Subscriber.slice.session.lbo_roaming_allowed` to `false` or leave it unset (default behavior)
+
+This allows flexible per-session roaming policy configuration based on subscriber profiles and service requirements.
+
 ### Home PLMN
 
-NRF shall follow TS23.003(28.3.2.3.2 Format of NRF FQDN) for routing.
+The NRF must include PLMN information when serving in a 5G roaming environment. This enables proper network function discovery and routing by providing the necessary PLMN context for roaming subscribers.
 
-- Create h-nrf.yaml
+**Create h-nrf.yaml:**
 
 ```bash
 $ sh -c 'cat << EOF > ./install/etc/open5gs/h-nrf.yaml
@@ -112,7 +133,9 @@
 EOF'
 ```
 
-- Update h-scp.yaml
+The SCP acts as a communication proxy between different network functions, enabling indirect communication and service discovery in the 5G Service Based Architecture.
+
+**Create h-scp.yaml:**
 
 ```bash
 $ sh -c 'cat << EOF > ./install/etc/open5gs/h-scp.yaml
@@ -137,9 +160,9 @@
 EOF'
 ```
 
-AUSF and UDM shall use FQDN in the Home PLMN.
+AUSF handles authentication procedures for UE access. It must use FQDN in the Home PLMN for proper authentication in roaming scenarios, ensuring that roaming subscribers can be properly authenticated by the home network.
 
-- Update ausf.yaml
+**Update ausf.yaml:**
 
 ```diff
 diff -u ./install/etc/open5gs/ausf.yaml.old ./install/etc/open5gs/ausf.yaml
@@ -163,7 +186,9 @@
  # SBI Server
 ```
 
-- Update udm.yaml
+UDM handles user data management and subscription information. It must also use Home PLMN FQDN to ensure proper user data retrieval and management for roaming subscribers.
+
+**Update udm.yaml:**
 
 ```diff
 $ diff -u ./install/etc/open5gs/udm.yaml.old ./install/etc/open5gs/udm.yaml
@@ -187,7 +212,9 @@
  ################################################################################
 ```
 
-- Update udr.yaml
+UDR stores subscription data and user profiles. It needs updated SCP client configuration to properly communicate with other network functions through the service communication proxy.
+
+**Update udr.yaml:**
 
 ```diff
 $ diff -u ./install/etc/open5gs/udr.yaml.old ./install/etc/open5gs/udr.yaml
@@ -204,7 +231,200 @@
  # SBI Server
 ```
 
-- Update sepp1.yaml
+SMF manages PDU sessions and requires comprehensive configuration for data plane handling. It coordinates with UPF for user plane traffic and handles session establishment, modification, and termination.
+
+**Create h-smf.yaml:**
+
+```bash
+$ sh -c 'cat << EOF > ./install/etc/open5gs/h-smf.yaml
+logger:
+  file:
+    path: /home/acetcom/Documents/git/open5gs/install/var/log/open5gs/smf.log
+#  level: info   # fatal|error|warn|info(default)|debug|trace
+
+global:
+  max:
+    ue: 1024  # The number of UE can be increased depending on memory size.
+#    peer: 64
+
+smf:
+  sbi:
+    server:
+      - address: smf.5gc.mnc070.mcc999.3gppnetwork.org
+    client:
+#      nrf:
+#        - uri: http://127.0.1.10:7777
+      scp:
+        - uri: http://127.0.1.200:7777
+  pfcp:
+    server:
+      - address: 127.0.1.4
+    client:
+      upf:
+        - address: 127.0.1.7
+  gtpc:
+    server:
+      - address: 127.0.1.4

open5gs_2.7.6.4730.0516.202507192026.tar.xz/docs/_posts/2025-07-19-release-v2.7.6.md Added

open5gs_2.7.6.4730.0516.202507192026.tar.xz/docs/assets/pcapng/5g-roaming-hr.pcapng Added

open5gs_2.7.6.4730.0516.202507192026.tar.xz/docs/assets/pcapng/5g-roaming-lbo.pcapng Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/app/ogs-config.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/app/ogs-config.c Changed

@@ -60,8 +60,8 @@
 
 static void recalculate_pool_size(void)
 {
-    ogs_app()->pool.packet =
-        global_conf.max.ue * OGS_MAX_NUM_OF_PACKET_BUFFER;
+    ogs_app()->pool.gtpu =
+        global_conf.max.ue * OGS_MAX_NUM_OF_GTPU_BUFFER;
 
 #define MAX_NUM_OF_TUNNEL       3   /* Num of Tunnel per Bearer */
     ogs_app()->pool.sess = global_conf.max.ue * OGS_MAX_NUM_OF_SESS;
@@ -1310,7 +1310,7 @@
 }
 
 ogs_app_policy_conf_t *ogs_app_policy_conf_find(
-        char *supi, ogs_plmn_id_t *plmn_id)
+        const char *supi, const ogs_plmn_id_t *plmn_id)
 {
     ogs_app_policy_conf_t *policy_conf;
     int i;
@@ -1386,7 +1386,7 @@
 }
 
 ogs_app_slice_conf_t *ogs_app_slice_conf_add(
-        ogs_app_policy_conf_t *policy_conf, ogs_s_nssai_t *s_nssai)
+        ogs_app_policy_conf_t *policy_conf, const ogs_s_nssai_t *s_nssai)
 {
     ogs_app_slice_conf_t *slice_conf = NULL;
 
@@ -1416,7 +1416,7 @@
 }
 
 ogs_app_slice_conf_t *ogs_app_slice_conf_find_by_s_nssai(
-        ogs_app_policy_conf_t *policy_conf, ogs_s_nssai_t *s_nssai)
+        ogs_app_policy_conf_t *policy_conf, const ogs_s_nssai_t *s_nssai)
 {
     ogs_app_slice_conf_t *slice_conf = NULL;
 
@@ -1486,7 +1486,7 @@
 }
 
 ogs_app_session_conf_t *ogs_app_session_conf_add(
-        ogs_app_slice_conf_t *slice_conf, char *name)
+        ogs_app_slice_conf_t *slice_conf, const char *name)
 {
     ogs_app_session_conf_t *session_conf = NULL;
 
@@ -1518,7 +1518,7 @@
     return session_conf;
 }
 ogs_app_session_conf_t *ogs_app_session_conf_find_by_dnn(
-        ogs_app_slice_conf_t *slice_conf, char *name)
+        ogs_app_slice_conf_t *slice_conf, const char *name)
 {
     ogs_app_session_conf_t *session_conf = NULL;
 
@@ -1561,7 +1561,8 @@
 }
 
 int ogs_app_config_session_data(
-        char *supi, ogs_plmn_id_t *plmn_id, ogs_s_nssai_t *s_nssai, char *dnn,
+        const char *supi, const ogs_plmn_id_t *plmn_id,
+        const ogs_s_nssai_t *s_nssai, const char *dnn,
         ogs_session_data_t *session_data)
 {
     ogs_app_policy_conf_t *policy_conf = NULL;

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/app/ogs-config.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/app/ogs-config.h Changed

@@ -208,27 +208,28 @@
 ogs_app_policy_conf_t *ogs_app_policy_conf_add(
         ogs_supi_range_t *supi_range, ogs_plmn_id_t *plmn_id);
 ogs_app_policy_conf_t *ogs_app_policy_conf_find(
-        char *supi, ogs_plmn_id_t *plmn_id);
+        const char *supi, const ogs_plmn_id_t *plmn_id);
 void ogs_app_policy_conf_remove(ogs_app_policy_conf_t *policy_conf);
 void ogs_app_policy_conf_remove_all(void);
 
 ogs_app_slice_conf_t *ogs_app_slice_conf_add(
-        ogs_app_policy_conf_t *policy_conf, ogs_s_nssai_t *s_nssai);
+        ogs_app_policy_conf_t *policy_conf, const ogs_s_nssai_t *s_nssai);
 ogs_app_slice_conf_t *ogs_app_slice_conf_find_by_s_nssai(
-        ogs_app_policy_conf_t *policy_conf, ogs_s_nssai_t *s_nssai);
+        ogs_app_policy_conf_t *policy_conf, const ogs_s_nssai_t *s_nssai);
 void ogs_app_slice_conf_remove(ogs_app_slice_conf_t *slice_conf);
 void ogs_app_slice_conf_remove_all(ogs_app_policy_conf_t *policy_conf);
 
 ogs_app_session_conf_t *ogs_app_session_conf_add(
-        ogs_app_slice_conf_t *slice_conf, char *name);
+        ogs_app_slice_conf_t *slice_conf, const char *name);
 ogs_app_session_conf_t *ogs_app_session_conf_find_by_dnn(
-        ogs_app_slice_conf_t *slice_conf, char *name);
+        ogs_app_slice_conf_t *slice_conf, const char *name);
 void ogs_app_session_conf_remove(ogs_app_session_conf_t *session_conf);
 void ogs_app_session_conf_remove_all(
         ogs_app_slice_conf_t *slice_conf);
 
 int ogs_app_config_session_data(
-        char *supi, ogs_plmn_id_t *plmn_id, ogs_s_nssai_t *s_nssai, char *dnn,
+        const char *supi, const ogs_plmn_id_t *plmn_id,
+        const ogs_s_nssai_t *s_nssai, const char *dnn,
         ogs_session_data_t *session_data);
 
 #ifdef __cplusplus

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/app/ogs-context.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/app/ogs-context.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/dbi/session.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/dbi/session.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -19,7 +19,8 @@
 
 #include "ogs-dbi.h"
 
-int ogs_dbi_session_data(char *supi, ogs_s_nssai_t *s_nssai, char *dnn,
+int ogs_dbi_session_data(
+        const char *supi, const ogs_s_nssai_t *s_nssai, const char *dnn,
         ogs_session_data_t *session_data)
 {
     int rv = OGS_OK;
@@ -168,6 +169,9 @@
         } else if (!strcmp(child4_key, OGS_TYPE_STRING) &&
             BSON_ITER_HOLDS_INT32(&child4_iter)) {
             session->session_type = bson_iter_int32(&child4_iter);
+        } else if (!strcmp(child4_key, OGS_LBO_ROAMING_ALLOWED_STRING) &&
+            BSON_ITER_HOLDS_BOOL(&child4_iter)) {
+            session->lbo_roaming_allowed = bson_iter_bool(&child4_iter);
         } else if (!strcmp(child4_key, OGS_QOS_STRING) &&
             BSON_ITER_HOLDS_DOCUMENT(&child4_iter)) {
             bson_iter_recurse(&child4_iter, &child5_iter);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/dbi/session.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/dbi/session.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/dbi/subscription.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/dbi/subscription.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/gtp/path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/gtp/path.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/gtp/path.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/gtp/path.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/gtp/v2/build.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/gtp/v2/build.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -117,6 +117,51 @@
     return pkbuf;
 }
 
+void ogs_gtp2_encapsulate_header(
+        ogs_gtp2_header_desc_t *header_desc, ogs_pkbuf_t *pkbuf)
+{
+    int i;
+
+    ogs_gtp2_header_t gtp_hdesc;
+    ogs_gtp2_extension_header_t ext_hdesc;
+
+    ogs_assert(header_desc);
+
+    memset(&gtp_hdesc, 0, sizeof(gtp_hdesc));
+    memset(&ext_hdesc, 0, sizeof(ext_hdesc));
+
+    gtp_hdesc.flags = header_desc->flags;
+    gtp_hdesc.type = header_desc->type;
+
+    i = 0;
+
+    if (header_desc->qos_flow_identifier) {
+        ext_hdesc.arrayi.type =
+            OGS_GTP2_EXTENSION_HEADER_TYPE_PDU_SESSION_CONTAINER;
+        ext_hdesc.arrayi.len = 1;
+        ext_hdesc.arrayi.pdu_type = header_desc->pdu_type;
+        ext_hdesc.arrayi.qos_flow_identifier =
+            header_desc->qos_flow_identifier;
+        i++;
+    }
+
+    if (header_desc->udp.presence == true) {
+        ext_hdesc.arrayi.type = OGS_GTP2_EXTENSION_HEADER_TYPE_UDP_PORT;
+        ext_hdesc.arrayi.len = 1;
+        ext_hdesc.arrayi.udp_port = htobe16(header_desc->udp.port);
+        i++;
+    }
+
+    if (header_desc->pdcp_number_presence == true) {
+        ext_hdesc.arrayi.type = OGS_GTP2_EXTENSION_HEADER_TYPE_PDCP_NUMBER;
+        ext_hdesc.arrayi.len = 1;
+        ext_hdesc.arrayi.pdcp_number = htobe16(header_desc->pdcp_number);
+        i++;
+    }
+
+    ogs_gtp2_fill_header(&gtp_hdesc, &ext_hdesc, pkbuf);
+}
+
 void ogs_gtp2_fill_header(
         ogs_gtp2_header_t *gtp_hdesc, ogs_gtp2_extension_header_t *ext_hdesc,
         ogs_pkbuf_t *pkbuf)
@@ -174,11 +219,8 @@
          * - The Error Indication message where the Tunnel Endpoint Identifier
          *   shall be set to all zeros.
          */
-        ogs_assert(gtp_hdesc->teid == 0);
     }
 
-    gtp_h->teid = htobe32(gtp_hdesc->teid);
-
     /*
      * TS29.281 5.1 General format in GTP-U header
      *

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/gtp/v2/build.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/gtp/v2/build.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/gtp/v2/path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/gtp/v2/path.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -19,72 +19,6 @@
 
 #include "ogs-gtp.h"
 
-int ogs_gtp2_send_user_plane(
-        ogs_gtp_node_t *gnode,
-        ogs_gtp2_header_desc_t *header_desc,
-        ogs_pkbuf_t *pkbuf)
-{
-    char bufOGS_ADDRSTRLEN;
-    int rv, i;
-
-    ogs_gtp2_header_t gtp_hdesc;
-    ogs_gtp2_extension_header_t ext_hdesc;
-
-    ogs_assert(header_desc);
-
-    memset(&gtp_hdesc, 0, sizeof(gtp_hdesc));
-    memset(&ext_hdesc, 0, sizeof(ext_hdesc));
-
-    gtp_hdesc.flags = header_desc->flags;
-    gtp_hdesc.type = header_desc->type;
-    gtp_hdesc.teid = header_desc->teid;
-
-    i = 0;
-
-    if (header_desc->qos_flow_identifier) {
-        ext_hdesc.arrayi.type =
-            OGS_GTP2_EXTENSION_HEADER_TYPE_PDU_SESSION_CONTAINER;
-        ext_hdesc.arrayi.len = 1;
-        ext_hdesc.arrayi.pdu_type = header_desc->pdu_type;
-        ext_hdesc.arrayi.qos_flow_identifier =
-            header_desc->qos_flow_identifier;
-        i++;
-    }
-
-    if (header_desc->udp.presence == true) {
-        ext_hdesc.arrayi.type = OGS_GTP2_EXTENSION_HEADER_TYPE_UDP_PORT;
-        ext_hdesc.arrayi.len = 1;
-        ext_hdesc.arrayi.udp_port = htobe16(header_desc->udp.port);
-        i++;
-    }
-
-    if (header_desc->pdcp_number_presence == true) {
-        ext_hdesc.arrayi.type = OGS_GTP2_EXTENSION_HEADER_TYPE_PDCP_NUMBER;
-        ext_hdesc.arrayi.len = 1;
-        ext_hdesc.arrayi.pdcp_number = htobe16(header_desc->pdcp_number);
-        i++;
-    }
-
-    ogs_gtp2_fill_header(&gtp_hdesc, &ext_hdesc, pkbuf);
-
-    ogs_trace("SEND GTP-U%d to Peer%s : TEID0x%x",
-            header_desc->type,
-            OGS_ADDR(&gnode->addr, buf), header_desc->teid);
-
-    rv = ogs_gtp_sendto(gnode, pkbuf);
-    if (rv != OGS_OK) {
-        if (ogs_socket_errno != OGS_EAGAIN) {
-            ogs_error("SEND GTP-U%d to Peer%s : TEID0x%x",
-                header_desc->type,
-                OGS_ADDR(&gnode->addr, buf), header_desc->teid);
-        }
-    }
-
-    ogs_pkbuf_free(pkbuf);
-
-    return rv;
-}
-
 ogs_pkbuf_t *ogs_gtp2_handle_echo_req(ogs_pkbuf_t *pkb)
 {
     ogs_gtp2_header_t *gtph = NULL;
@@ -305,7 +239,6 @@
 void ogs_gtp1_send_error_indication(
         ogs_sock_t *sock, uint32_t teid, uint8_t qfi, const ogs_sockaddr_t *to)
 {
-    ssize_t sent;
     ogs_pkbuf_t *pkbuf = NULL;
 
     ogs_gtp2_header_t gtp_hdesc;
@@ -343,10 +276,7 @@
 
     ogs_gtp2_fill_header(&gtp_hdesc, &ext_hdesc, pkbuf);
 
-    sent = ogs_sendto(sock->fd, pkbuf->data, pkbuf->len, 0, to);
-    if (sent < 0 || sent != pkbuf->len) {
-        ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
-                "ogs_sendto() failed");
-    }
+    ogs_gtp_send_with_teid(sock, pkbuf, teid, (ogs_sockaddr_t *)to);
+
     ogs_pkbuf_free(pkbuf);
 }

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/gtp/v2/path.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/gtp/v2/path.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/nas/5gs/encoder.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/nas/5gs/encoder.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/nas/5gs/support/nas-message.py -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/nas/5gs/support/nas-message.py Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/nas/5gs/types.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/nas/5gs/types.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/nas/common/types.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/nas/common/types.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/nas/eps/encoder.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/nas/eps/encoder.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/nas/eps/support/nas-message.py -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/nas/eps/support/nas-message.py Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/pfcp/build.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/pfcp/build.c Changed

@@ -781,20 +781,20 @@
 }
 
 void ogs_pfcp_build_update_urr(
-    ogs_pfcp_tlv_update_urr_t *message, int i, ogs_pfcp_urr_t *urr, uint64_t modify_flags)
+    ogs_pfcp_tlv_update_urr_t *message, int i,
+    ogs_pfcp_urr_t *urr, uint64_t modify_flags)
 {
     ogs_assert(message);
     ogs_assert(urr);
 
-    /* No change requested, skip. */
-    if (!(modify_flags & (OGS_PFCP_MODIFY_URR_MEAS_METHOD|
-                          OGS_PFCP_MODIFY_URR_REPORT_TRIGGER|
-                          OGS_PFCP_MODIFY_URR_VOLUME_THRESH|
-                          OGS_PFCP_MODIFY_URR_VOLUME_QUOTA|
-                          OGS_PFCP_MODIFY_URR_TIME_THRESH|
-                          OGS_PFCP_MODIFY_URR_TIME_QUOTA|
-                          OGS_PFCP_MODIFY_URR_QUOTA_VALIDITY_TIME)))
-        return;
+    ogs_assert(modify_flags &
+            (OGS_PFCP_MODIFY_URR_MEAS_METHOD|
+             OGS_PFCP_MODIFY_URR_REPORT_TRIGGER|
+             OGS_PFCP_MODIFY_URR_VOLUME_THRESH|
+             OGS_PFCP_MODIFY_URR_VOLUME_QUOTA|
+             OGS_PFCP_MODIFY_URR_TIME_THRESH|
+             OGS_PFCP_MODIFY_URR_TIME_QUOTA|
+             OGS_PFCP_MODIFY_URR_QUOTA_VALIDITY_TIME));
 
     /* Change request: Send only changed IEs */
     message->presence = 1;
@@ -891,26 +891,35 @@
 }
 
 void ogs_pfcp_build_update_qer(
-    ogs_pfcp_tlv_update_qer_t *message, int i, ogs_pfcp_qer_t *qer)
+    ogs_pfcp_tlv_update_qer_t *message, int i,
+    ogs_pfcp_qer_t *qer, uint64_t modify_flags)
 {
     ogs_assert(message);
     ogs_assert(qer);
 
+    ogs_assert(modify_flags &
+            (OGS_PFCP_MODIFY_QOS_MODIFY|
+             OGS_PFCP_MODIFY_EPC_QOS_UPDATE));
+
     message->presence = 1;
     message->qer_id.presence = 1;
     message->qer_id.u32 = qer->id;
 
-    if (qer->mbr.uplink || qer->mbr.downlink) {
-        message->maximum_bitrate.presence = 1;
-        ogs_pfcp_build_bitrate(
-                &message->maximum_bitrate,
-                &qer->mbr, update_qer_bufi.mbr, OGS_PFCP_BITRATE_LEN);
-    }
-    if (qer->gbr.uplink || qer->gbr.downlink) {
-        message->guaranteed_bitrate.presence = 1;
-        ogs_pfcp_build_bitrate(
-                &message->guaranteed_bitrate,
-                &qer->gbr, update_qer_bufi.gbr, OGS_PFCP_BITRATE_LEN);
+    if (modify_flags &
+            (OGS_PFCP_MODIFY_QOS_MODIFY|
+             OGS_PFCP_MODIFY_EPC_QOS_UPDATE)) {
+        if (qer->mbr.uplink || qer->mbr.downlink) {
+            message->maximum_bitrate.presence = 1;
+            ogs_pfcp_build_bitrate(
+                    &message->maximum_bitrate,
+                    &qer->mbr, update_qer_bufi.mbr, OGS_PFCP_BITRATE_LEN);
+        }
+        if (qer->gbr.uplink || qer->gbr.downlink) {
+            message->guaranteed_bitrate.presence = 1;
+            ogs_pfcp_build_bitrate(
+                    &message->guaranteed_bitrate,
+                    &qer->gbr, update_qer_bufi.gbr, OGS_PFCP_BITRATE_LEN);
+        }
     }
 }

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/pfcp/build.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/pfcp/build.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/pfcp/context.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/pfcp/context.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/pfcp/context.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/pfcp/context.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/pfcp/handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/pfcp/handler.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -216,11 +216,13 @@
 }
 
 bool ogs_pfcp_up_handle_pdr(
-        ogs_pfcp_pdr_t *pdr, uint8_t type,
+        ogs_pfcp_pdr_t *pdr, uint8_t type, int len,
         ogs_gtp2_header_desc_t *recvhdr, ogs_pkbuf_t *sendbuf,
         ogs_pfcp_user_plane_report_t *report)
 {
     ogs_pfcp_far_t *far = NULL;
+
+    ogs_gtp2_header_desc_t sendhdr;
     bool buffering;
 
     ogs_assert(sendbuf);
@@ -231,36 +233,109 @@
     far = pdr->far;
     ogs_assert(far);
 
+    buffering = false;
+
     memset(report, 0, sizeof(*report));
 
-    buffering = false;
+    if ((pdr->src_if == OGS_PFCP_INTERFACE_CORE &&
+         pdr->src_if_type_presence == true &&
+         pdr->src_if_type ==
+             OGS_PFCP_3GPP_INTERFACE_TYPE_N9_FOR_ROAMING) ||
+        (far->dst_if == OGS_PFCP_INTERFACE_CORE &&
+         far->dst_if_type_presence == true &&
+         far->dst_if_type ==
+             OGS_PFCP_3GPP_INTERFACE_TYPE_N9_FOR_ROAMING)) {
+    /*
+     * <Home Routed Roaming>
+     * - VPLMN
+     * o DL
+     *  PDR->src : Core/N9-for-roaming
+     *  FAT->dst : Access/N3
+     * o UL
+     *  PDR->src : Access/N3
+     *  FAT->dst : Core/N9-for-roaming
+     * - HPLMN
+     * o DL
+     *  PDR->src : Core/N6
+     *  FAT->dst : Access/N9-for-roaming
+     * o UL
+     *  PDR->src : Access/N9-for-roaming
+     *  FAT->dst : Core/N6
+     */
+
+    /*
+     * For Home Routed Roaming, when the UPF is located in the VPLMN,
+     * only the TEID in the GTP header is modified. Since the TEID
+     * can only exist in the Outer Header Creator during the Activation
+     * process, it is not filled in at this stage.
+     *
+     * The TEID might be determined later due to buffering, so it is
+     * filled in during the GPDU transmission stage.
+     */
+        ogs_pkbuf_push(sendbuf, len);
+
+    } else {
+    /*
+     * <Normal>
+     * o DL
+     *  PDR->src : Core/N6
+     *  FAT->dst : Access/N3
+     * o UL
+     *  PDR->src : Access/N3
+     *  FAT->dst : Core/N6
+     * o CP2UP
+     *  PDR->src : CP-function
+     *  FAT->dst : Access/N3
+     * o UP2CP
+     *  PDR->src : Access/N3
+     *  FAT->dst : CP-function
+     *
+     * <Indirect>
+     *  PDR->src : Access/UL-Forwarding
+     *  FAT->dst : Access/DL-Forwarding
+     */
+        memset(&sendhdr, 0, sizeof(sendhdr));
+
+        sendhdr.type = type;
+        sendhdr.teid = far->outer_header_creation.teid;
+
+        if (pdr->qer && pdr->qer->qfi) {
+            sendhdr.pdu_type =
+                OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_DL_PDU_SESSION_INFORMATION;
+            sendhdr.qos_flow_identifier = pdr->qer->qfi;
+        }
+
+        if (recvhdr) {
+            /*
+             * Issue #2584
+             * Discussion #2477
+             *
+             * Forward PDCP Number via Indirect Tunnel during Handover
+             */
+            if (recvhdr->pdcp_number_presence == true) {
+                sendhdr.pdcp_number_presence = recvhdr->pdcp_number_presence;
+                sendhdr.pdcp_number = recvhdr->pdcp_number;
+            }
+
+            if (recvhdr->udp.presence == true) {
+                sendhdr.udp.presence = recvhdr->udp.presence;
+                sendhdr.udp.port = recvhdr->udp.port;
+            }
+        }
+
+        ogs_gtp2_encapsulate_header(&sendhdr, sendbuf);
+
+        ogs_trace("ENCAP GTP-U%d, TEID0x%x", sendhdr.type, sendhdr.teid);
+    }
 
     if (!far->gnode) {
+
         buffering = true;
 
     } else {
         if (far->apply_action & OGS_PFCP_APPLY_ACTION_FORW) {
-            ogs_gtp2_header_desc_t sendhdr;
-
-            /* Forward packet */
-            memset(&sendhdr, 0, sizeof(sendhdr));
-            sendhdr.type = type;
-
-            if (recvhdr) {
-                /*
-                 * Issue #2584
-                 * Discussion #2477
-                 *
-                 * Forward PDCP Number via Indirect Tunnel during Handover
-                 */
-                if (recvhdr->pdcp_number_presence == true) {
-                    sendhdr.pdcp_number_presence =
-                        recvhdr->pdcp_number_presence;
-                    sendhdr.pdcp_number = recvhdr->pdcp_number;
-                }
-            }
 
-            ogs_pfcp_send_g_pdu(pdr, &sendhdr, sendbuf);
+            ogs_pfcp_send_gtpu(pdr, sendbuf);
 
         } else if (far->apply_action & OGS_PFCP_APPLY_ACTION_BUFF) {
 
@@ -274,14 +349,14 @@
 
     if (buffering == true) {
 
-        if (far->num_of_buffered_packet == 0) {
+        if (far->num_of_buffered_gtpu == 0) {
             /* Only the first time a packet is buffered,
              * it reports downlink notifications. */
             report->type.downlink_data_report = 1;
         }
 
-        if (far->num_of_buffered_packet < OGS_MAX_NUM_OF_PACKET_BUFFER) {
-            far->buffered_packetfar->num_of_buffered_packet++ = sendbuf;
+        if (far->num_of_buffered_gtpu < OGS_MAX_NUM_OF_GTPU_BUFFER) {
+            far->buffered_gtpufar->num_of_buffered_gtpu++ = sendbuf;
         } else {
             ogs_pkbuf_free(sendbuf);
         }

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/pfcp/handler.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/pfcp/handler.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/pfcp/path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/pfcp/path.c Changed

@@ -395,17 +395,12 @@
     return rv;
 }
 
-void ogs_pfcp_send_g_pdu(
-        ogs_pfcp_pdr_t *pdr,
-        ogs_gtp2_header_desc_t *sendhdr, ogs_pkbuf_t *sendbuf)
+void ogs_pfcp_send_gtpu(ogs_pfcp_pdr_t *pdr, ogs_pkbuf_t *sendbuf)
 {
     ogs_gtp_node_t *gnode = NULL;
     ogs_pfcp_far_t *far = NULL;
 
-    ogs_gtp2_header_desc_t header_desc;
-
     ogs_assert(pdr);
-    ogs_assert(sendhdr);
     ogs_assert(sendbuf);
 
     far = pdr->far;
@@ -422,55 +417,49 @@
     }
 
     gnode = far->gnode;
-    ogs_assert(gnode);
-    ogs_assert(gnode->sock);
+    if (!gnode) {
+        ogs_error("No GTP Node Setup");
+        ogs_pkbuf_free(sendbuf);
+        return;
+    }
+    if (!gnode->sock) {
+        ogs_error("No GTP Socket Setup");
+        ogs_pkbuf_free(sendbuf);
+        return;
+    }
 
-    memset(&header_desc, 0, sizeof(header_desc));
+    ogs_gtp_send_with_teid(
+            gnode->sock,
+            sendbuf, far->outer_header_creation.teid,
+            &gnode->addr);
 
-    header_desc.type = sendhdr->type;
-    header_desc.teid = far->outer_header_creation.teid;
+    ogs_pkbuf_free(sendbuf);
+}
 
-    if (pdr->qer && pdr->qer->qfi) {
-        header_desc.pdu_type =
-            OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_DL_PDU_SESSION_INFORMATION;
-        header_desc.qos_flow_identifier = pdr->qer->qfi;
-    }
+void ogs_pfcp_send_buffered_gtpu(ogs_pfcp_pdr_t *pdr)
+{
+    ogs_pfcp_far_t *far = NULL;
+    int i;
 
-    if (sendhdr->udp.presence == true) {
-        header_desc.udp.presence = sendhdr->udp.presence;
-        header_desc.udp.port = sendhdr->udp.port;
-    }
+    ogs_assert(pdr);
+    far = pdr->far;
 
-    if (sendhdr->pdcp_number_presence == true) {
-        header_desc.pdcp_number_presence = sendhdr->pdcp_number_presence;
-        header_desc.pdcp_number = sendhdr->pdcp_number;
+    if (far && far->gnode) {
+        if (far->apply_action & OGS_PFCP_APPLY_ACTION_FORW) {
+            for (i = 0; i < far->num_of_buffered_gtpu; i++) {
+                ogs_pfcp_send_gtpu(pdr, far->buffered_gtpui);
+            }
+            far->num_of_buffered_gtpu = 0;
+        }
     }
-
-    ogs_gtp2_send_user_plane(gnode, &header_desc, sendbuf);
 }
 
 int ogs_pfcp_send_end_marker(ogs_pfcp_pdr_t *pdr)
 {
-    ogs_gtp_node_t *gnode = NULL;
-    ogs_pfcp_far_t *far = NULL;
-
     ogs_pkbuf_t *sendbuf = NULL;
-
     ogs_gtp2_header_desc_t header_desc;
 
     ogs_assert(pdr);
-    far = pdr->far;
-    ogs_assert(far);
-
-    gnode = far->gnode;
-    if (!gnode) {
-        ogs_error("No GTP Node Setup");
-        return OGS_DONE;
-    }
-    if (!gnode->sock) {
-        ogs_error("No GTP Socket Setup");
-        return OGS_DONE;
-    }
 
     sendbuf = ogs_pkbuf_alloc(NULL, OGS_GTPV1U_5GC_HEADER_LEN);
     if (!sendbuf) {
@@ -480,9 +469,7 @@
     ogs_pkbuf_reserve(sendbuf, OGS_GTPV1U_5GC_HEADER_LEN);
 
     memset(&header_desc, 0, sizeof(header_desc));
-
     header_desc.type = OGS_GTPU_MSGTYPE_END_MARKER;
-    header_desc.teid = far->outer_header_creation.teid;
 
     if (pdr->qer && pdr->qer->qfi) {
         header_desc.pdu_type =
@@ -490,33 +477,11 @@
         header_desc.qos_flow_identifier = pdr->qer->qfi;
     }
 
-    ogs_gtp2_send_user_plane(gnode, &header_desc, sendbuf);
-
-    return OGS_OK;
-}
-
-void ogs_pfcp_send_buffered_packet(ogs_pfcp_pdr_t *pdr)
-{
-    ogs_pfcp_far_t *far = NULL;
-    int i;
+    ogs_gtp2_encapsulate_header(&header_desc, sendbuf);
 
-    ogs_assert(pdr);
-    far = pdr->far;
+    ogs_pfcp_send_gtpu(pdr, sendbuf);
 
-    if (far && far->gnode) {
-        if (far->apply_action & OGS_PFCP_APPLY_ACTION_FORW) {
-            for (i = 0; i < far->num_of_buffered_packet; i++) {
-                ogs_gtp2_header_desc_t sendhdr;
-
-                memset(&sendhdr, 0, sizeof(sendhdr));
-                sendhdr.type = OGS_GTPU_MSGTYPE_GPDU;
-
-                ogs_pfcp_send_g_pdu(
-                        pdr, &sendhdr, far->buffered_packeti);
-            }
-            far->num_of_buffered_packet = 0;
-        }
-    }
+    return OGS_OK;
 }
 
 void ogs_pfcp_send_error_message(

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/pfcp/path.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/pfcp/path.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/pfcp/xact.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/pfcp/xact.h Changed

@@ -102,21 +102,22 @@
 #define OGS_PFCP_MODIFY_QOS_DELETE ((uint64_t)1<<16)
 #define OGS_PFCP_MODIFY_OUTER_HEADER_REMOVAL ((uint64_t)1<<17)
 #define OGS_PFCP_MODIFY_ACTIVATE ((uint64_t)1<<18)
-#define OGS_PFCP_MODIFY_DEACTIVATE ((uint64_t)1<<19)
-#define OGS_PFCP_MODIFY_END_MARKER ((uint64_t)1<<20)
-#define OGS_PFCP_MODIFY_ERROR_INDICATION ((uint64_t)1<<21)
-#define OGS_PFCP_MODIFY_XN_HANDOVER ((uint64_t)1<<22)
-#define OGS_PFCP_MODIFY_N2_HANDOVER ((uint64_t)1<<23)
-#define OGS_PFCP_MODIFY_HANDOVER_CANCEL ((uint64_t)1<<24)
-#define OGS_PFCP_MODIFY_HOME_ROUTED_ROAMING ((uint64_t)1<<25)
-#define OGS_PFCP_MODIFY_URR  ((uint64_t)1<<26) /* type of trigger */
-#define OGS_PFCP_MODIFY_URR_MEAS_METHOD ((uint64_t)1<<27)
-#define OGS_PFCP_MODIFY_URR_REPORT_TRIGGER ((uint64_t)1<<28)
-#define OGS_PFCP_MODIFY_URR_QUOTA_VALIDITY_TIME ((uint64_t)1<<29)
-#define OGS_PFCP_MODIFY_URR_VOLUME_QUOTA ((uint64_t)1<<30)
-#define OGS_PFCP_MODIFY_URR_TIME_QUOTA ((uint64_t)1<<31)
-#define OGS_PFCP_MODIFY_URR_VOLUME_THRESH ((uint64_t)1<<32)
-#define OGS_PFCP_MODIFY_URR_TIME_THRESH ((uint64_t)1<<33)
+#define OGS_PFCP_MODIFY_FROM_ACTIVATING ((uint64_t)1<<19)
+#define OGS_PFCP_MODIFY_DEACTIVATE ((uint64_t)1<<20)
+#define OGS_PFCP_MODIFY_END_MARKER ((uint64_t)1<<21)
+#define OGS_PFCP_MODIFY_ERROR_INDICATION ((uint64_t)1<<22)
+#define OGS_PFCP_MODIFY_XN_HANDOVER ((uint64_t)1<<23)
+#define OGS_PFCP_MODIFY_N2_HANDOVER ((uint64_t)1<<24)
+#define OGS_PFCP_MODIFY_HANDOVER_CANCEL ((uint64_t)1<<25)
+#define OGS_PFCP_MODIFY_HOME_ROUTED_ROAMING ((uint64_t)1<<26)
+#define OGS_PFCP_MODIFY_URR  ((uint64_t)1<<27) /* type of trigger */
+#define OGS_PFCP_MODIFY_URR_MEAS_METHOD ((uint64_t)1<<28)
+#define OGS_PFCP_MODIFY_URR_REPORT_TRIGGER ((uint64_t)1<<29)
+#define OGS_PFCP_MODIFY_URR_QUOTA_VALIDITY_TIME ((uint64_t)1<<30)
+#define OGS_PFCP_MODIFY_URR_VOLUME_QUOTA ((uint64_t)1<<31)
+#define OGS_PFCP_MODIFY_URR_TIME_QUOTA ((uint64_t)1<<32)
+#define OGS_PFCP_MODIFY_URR_VOLUME_THRESH ((uint64_t)1<<33)
+#define OGS_PFCP_MODIFY_URR_TIME_THRESH ((uint64_t)1<<34)
     uint64_t        modify_flags;
 
 #define OGS_PFCP_DELETE_TRIGGER_LOCAL_INITIATED 1

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/proto/types.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/proto/types.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/proto/types.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/proto/types.h Changed

@@ -31,7 +31,7 @@
 #define OGS_MAX_NUM_OF_SESS             4   /* Num of APN(Session) per UE */
 #define OGS_MAX_NUM_OF_BEARER           4   /* Num of Bearer per Session */
 #define OGS_BEARER_PER_UE               8   /* Num of Bearer per UE */
-#define OGS_MAX_NUM_OF_PACKET_BUFFER    64  /* Num of PacketBuffer per UE */
+#define OGS_MAX_NUM_OF_GTPU_BUFFER      64  /* Num of GTPU Buffer per UE */
 
 /*
  * TS24.008
@@ -193,6 +193,7 @@
 #define OGS_SESSION_STRING "session"
 #define OGS_NAME_STRING "name"
 #define OGS_TYPE_STRING "type"
+#define OGS_LBO_ROAMING_ALLOWED_STRING "lbo_roaming_allowed"
 #define OGS_QOS_STRING "qos"
 #define OGS_INDEX_STRING "index"
 #define OGS_ARP_STRING "arp"
@@ -621,6 +622,8 @@
 #define OGS_PDU_SESSION_TYPE_FROM_DIAMETER(x)       ((x)+1)
     uint8_t session_type;
 
+    bool lbo_roaming_allowed; /* true: Allowed, false: Not allowed */
+
 #define OGS_SSC_MODE_1                              1
 #define OGS_SSC_MODE_2                              2
 #define OGS_SSC_MODE_3                              3

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/sbi/context.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/sbi/context.c Changed

@@ -1371,6 +1371,9 @@
         ogs_free(nf_instance->id);
     }
 
+    if (nf_instance->hnrf_uri)
+        ogs_free(nf_instance->hnrf_uri);
+
     if (nf_instance->client)
         ogs_sbi_client_remove(nf_instance->client);
 
@@ -2152,6 +2155,11 @@
             return false;
     }
 
+    if (nf_instance->nf_type == OpenAPI_nf_type_NRF &&
+            ogs_sbi_discovery_option_hnrf_uri_is_matched(
+                nf_instance, discovery_option) == false)
+        return false;
+
     ogs_list_for_each(&nf_instance->nf_info_list, nf_info) {
         if (nf_instance->nf_type != nf_info->nf_type) {
             ogs_error("Invalid NF-Type %d:%d",
@@ -2284,6 +2292,23 @@
     return false;
 }
 
+bool ogs_sbi_discovery_option_hnrf_uri_is_matched(
+        ogs_sbi_nf_instance_t *nf_instance,
+        ogs_sbi_discovery_option_t *discovery_option)
+{
+    ogs_assert(nf_instance);
+    ogs_assert(discovery_option);
+
+    if (nf_instance->hnrf_uri == NULL && discovery_option->hnrf_uri == NULL)
+        return true;
+    else if (nf_instance->hnrf_uri == NULL ||
+            discovery_option->hnrf_uri == NULL)
+        return false;
+
+    return ogs_strcasecmp(nf_instance->hnrf_uri,
+            discovery_option->hnrf_uri) == 0;
+}
+
 bool ogs_sbi_discovery_param_is_matched(
         ogs_sbi_nf_instance_t *nf_instance,
         OpenAPI_nf_type_e target_nf_type,
@@ -2448,6 +2473,8 @@
         if (sbi_object->nf_type_arrayi.nf_instance_id)
             ogs_free(sbi_object->nf_type_arrayi.nf_instance_id);
     }
+    if (sbi_object->home_nsmf_pdusession.nf_instance_id)
+        ogs_free(sbi_object->home_nsmf_pdusession.nf_instance_id);
 }
 
 ogs_sbi_xact_t *ogs_sbi_xact_add(

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/sbi/context.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/sbi/context.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/sbi/conv.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/sbi/conv.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/sbi/message.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/sbi/message.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -139,6 +139,30 @@
         OpenAPI_sm_context_release_data_free(message->SmContextReleaseData);
     if (message->SmContextReleasedData)
         OpenAPI_sm_context_released_data_free(message->SmContextReleasedData);
+    if (message->PduSessionCreateData)
+        OpenAPI_pdu_session_create_data_free(message->PduSessionCreateData);
+    if (message->PduSessionCreatedData)
+        OpenAPI_pdu_session_created_data_free(message->PduSessionCreatedData);
+    if (message->PduSessionCreateError)
+        OpenAPI_pdu_session_create_error_free(message->PduSessionCreateError);
+    if (message->HsmfUpdateData)
+        OpenAPI_hsmf_update_data_free(message->HsmfUpdateData);
+    if (message->HsmfUpdatedData)
+        OpenAPI_hsmf_updated_data_free(message->HsmfUpdatedData);
+    if (message->HsmfUpdateError)
+        OpenAPI_hsmf_update_error_free(message->HsmfUpdateError);
+    if (message->VsmfUpdateData)
+        OpenAPI_vsmf_update_data_free(message->VsmfUpdateData);
+    if (message->VsmfUpdatedData)
+        OpenAPI_vsmf_updated_data_free(message->VsmfUpdatedData);
+    if (message->VsmfUpdateError)
+        OpenAPI_vsmf_update_error_free(message->VsmfUpdateError);
+    if (message->ReleaseData)
+        OpenAPI_release_data_free(message->ReleaseData);
+    if (message->ReleasedData)
+        OpenAPI_released_data_free(message->ReleasedData);
+    if (message->StatusNotification)
+        OpenAPI_status_notification_free(message->StatusNotification);
     if (message->SessionManagementSubscriptionDataList) {
         OpenAPI_lnode_t *node = NULL;
         OpenAPI_list_for_each(message->SessionManagementSubscriptionDataList, node)
@@ -523,6 +547,10 @@
                                 &discovery_option->requester_plmn_list0));
             }
         }
+        if (discovery_option->hnrf_uri) {
+            ogs_sbi_header_set(request->http.params,
+                    OGS_SBI_PARAM_HNRF_URI, discovery_option->hnrf_uri);
+        }
         if (discovery_option->requester_features) {
             char *v = ogs_uint64_to_string(
                     discovery_option->requester_features);
@@ -618,35 +646,55 @@
         ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_SNSSAI, v);
         ogs_free(v);
     }
-    if (message->param.slice_info_request_for_pdu_session_presence) {
+    if (message->param.slice_info_for_pdu_session_presence) {
         OpenAPI_slice_info_for_pdu_session_t SliceInfoForPDUSession;
-        OpenAPI_snssai_t sNSSAI;
+        OpenAPI_snssai_t sNssai, homeSnssai;
 
         char *v = NULL;
         cJSON *item = NULL;
 
+        if (!message->param.snssai_presence) {
+            ogs_error("No S-NSSAI");
+            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;
-        sNSSAI.sd = ogs_s_nssai_sd_to_string(message->param.s_nssai.sd);
+        memset(&sNssai, 0, sizeof(sNssai));
+        sNssai.sst = message->param.s_nssai.sst;
+        sNssai.sd = ogs_s_nssai_sd_to_string(message->param.s_nssai.sd);
+
+        memset(&homeSnssai, 0, sizeof(homeSnssai));
+        if (message->param.home_snssai_presence) {
+            homeSnssai.sst = message->param.home_snssai.sst;
+            homeSnssai.sd = ogs_s_nssai_sd_to_string(
+                    message->param.home_snssai.sd);
+        }
 
         memset(&SliceInfoForPDUSession, 0, sizeof(SliceInfoForPDUSession));
 
-        SliceInfoForPDUSession.s_nssai = &sNSSAI;
+        SliceInfoForPDUSession.s_nssai = &sNssai;
         SliceInfoForPDUSession.roaming_indication =
             message->param.roaming_indication;
+        if (homeSnssai.sst)
+            SliceInfoForPDUSession.home_snssai = &homeSnssai;
 
         item = OpenAPI_slice_info_for_pdu_session_convertToJSON(
                 &SliceInfoForPDUSession);
         if (!item) {
             ogs_error("OpenAPI_slice_info_for_pdu_session_convertToJSON() "
                     "failed");
+
+            if (sNssai.sd)
+                ogs_free(sNssai.sd);
+            if (homeSnssai.sd)
+                ogs_free(homeSnssai.sd);
             ogs_sbi_request_free(request);
+
             return NULL;
         }
 
@@ -654,6 +702,12 @@
         if (!v) {
             ogs_error("cJSON_PrintUnformatted() failed");
             ogs_sbi_request_free(request);
+
+            if (sNssai.sd)
+                ogs_free(sNssai.sd);
+            if (homeSnssai.sd)
+                ogs_free(homeSnssai.sd);
+
             return NULL;
         }
         cJSON_Delete(item);
@@ -662,8 +716,30 @@
                 OGS_SBI_PARAM_SLICE_INFO_REQUEST_FOR_PDU_SESSION, v);
         ogs_free(v);
 
-        if (sNSSAI.sd)
-            ogs_free(sNSSAI.sd);
+        if (sNssai.sd)
+            ogs_free(sNssai.sd);
+        if (homeSnssai.sd)
+            ogs_free(homeSnssai.sd);
+    }
+    if (message->param.num_of_fields) {
+        char *fields;
+
+        fields = ogs_strdup(message->param.fields0);
+        if (!fields) {
+            ogs_error("ogs_strdup() failed");
+            return NULL;
+        }
+
+        for (i = 1; i < message->param.num_of_fields; i++)
+            fields = ogs_mstrcatf(
+                    fields, ",%s", message->param.fieldsi);
+
+        if (fields) {
+            ogs_sbi_header_set(request->http.params,
+                    OGS_SBI_PARAM_FIELDS, fields);
+            ogs_free(fields);
+        }
+
     }
     if (message->param.num_of_fields) {
         char *fields;
@@ -694,6 +770,72 @@
                 OGS_SBI_PARAM_IPV6PREFIX, message->param.ipv6prefix);
     }
 
+    if (message->param.home_plmn_id_presence) {
+        OpenAPI_plmn_id_t home_plmn_id;
+
+        home_plmn_id.mnc = ogs_plmn_id_mnc_string(&message->param.home_plmn_id);
+        home_plmn_id.mcc = ogs_plmn_id_mcc_string(&message->param.home_plmn_id);
+
+        if (home_plmn_id.mnc && home_plmn_id.mcc) {
+            char *v = NULL;
+            cJSON *item = NULL;
+
+            item = OpenAPI_plmn_id_convertToJSON(&home_plmn_id);
+            if (!item) {
+                ogs_error("OpenAPI_plmn_id_convertToJSON() failed");
+                ogs_sbi_request_free(request);
+                return NULL;
+            }
+            if (home_plmn_id.mnc) ogs_free(home_plmn_id.mnc);
+            if (home_plmn_id.mcc) ogs_free(home_plmn_id.mcc);
+
+            v = cJSON_PrintUnformatted(item);
+            if (!v) {
+                ogs_error("cJSON_PrintUnformatted() failed");
+                ogs_sbi_request_free(request);
+                return NULL;
+            }
+            cJSON_Delete(item);
+
+            ogs_sbi_header_set(
+                    request->http.params, OGS_SBI_PARAM_HOME_PLMN_ID, v);
+            ogs_free(v);
+        }
+    }
+
+    if (message->param.tai_presence) {
+        OpenAPI_tai_t tai;
+
+        memset(&tai, 0, sizeof(tai));
+        tai.plmn_id = ogs_sbi_build_plmn_id(&message->param.tai.plmn_id);
+        tai.tac = ogs_uint24_to_0string(message->param.tai.tac);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/sbi/message.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/sbi/message.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -120,6 +120,9 @@
 #define OGS_SBI_RESOURCE_NAME_MODIFY                "modify"
 #define OGS_SBI_RESOURCE_NAME_RELEASE               "release"
 
+#define OGS_SBI_RESOURCE_NAME_PDU_SESSIONS          "pdu-sessions"
+#define OGS_SBI_RESOURCE_NAME_VSMF_PDU_SESSIONS     "vsmf-pdu-session"
+
 #define OGS_SBI_RESOURCE_NAME_SM_POLICY_NOTIFY      "sm-policy-notify"
 #define OGS_SBI_RESOURCE_NAME_N1_N2_FAILURE_NOTIFY  "n1-n2-failure-notify"
 
@@ -308,6 +311,8 @@
     OGS_SBI_CUSTOM_DISCOVERY_COMMON OGS_SBI_PARAM_REQUESTER_FEATURES
 #define OGS_SBI_CUSTOM_DISCOVERY_GUAMI  \
     OGS_SBI_CUSTOM_DISCOVERY_COMMON OGS_SBI_PARAM_GUAMI
+#define OGS_SBI_CUSTOM_DISCOVERY_HNRF_URI  \
+    OGS_SBI_CUSTOM_DISCOVERY_COMMON OGS_SBI_PARAM_HNRF_URI
 #define OGS_SBI_CUSTOM_PRODUCER_ID       \
     OGS_SBI_CUSTOM_3GPP_COMMON "Producer-Id"
 #define OGS_SBI_CUSTOM_OCI               \
@@ -351,6 +356,13 @@
 #define OGS_SBI_PARAM_FIELDS                        "fields"
 #define OGS_SBI_PARAM_IPV4ADDR                      "ipv4Addr"
 #define OGS_SBI_PARAM_IPV6PREFIX                    "ipv6Prefix"
+#define OGS_SBI_PARAM_HOME_PLMN_ID                  "home-plmn-id"
+#define OGS_SBI_PARAM_HNRF_URI                      "hnrf-uri"
+
+#define OGS_SBI_PARAM_FIELDS_GPSIS                       "gpsis"
+#define OGS_SBI_PARAM_FIELDS_SUBSCRIBED_UE_AMBR          "subscribedUeAmbr"
+#define OGS_SBI_PARAM_FIELDS_NSSAI                       "nssai"
+#define OGS_SBI_MAX_NUM_OF_FIELDS                         8
 
 #define OGS_SBI_PARAM_FIELDS_GPSIS                       "gpsis"
 #define OGS_SBI_PARAM_FIELDS_SUBSCRIBED_UE_AMBR          "subscribedUeAmbr"
@@ -461,6 +473,8 @@
     int num_of_requester_plmn_list;
     ogs_plmn_id_t requester_plmn_listOGS_MAX_NUM_OF_PLMN;
 
+    char *hnrf_uri;
+
     uint64_t requester_features;
 } ogs_sbi_discovery_option_t;
 
@@ -497,17 +511,25 @@
         char *fieldsOGS_SBI_MAX_NUM_OF_FIELDS;
 
         /* Shared memory */
+        bool plmn_id_presence;
         ogs_plmn_id_t plmn_id;
-        ogs_s_nssai_t s_nssai;
 
-        bool plmn_id_presence;
         bool single_nssai_presence;
         bool snssai_presence;
-        bool slice_info_request_for_pdu_session_presence;
+        ogs_s_nssai_t s_nssai;
+
+        bool slice_info_for_pdu_session_presence;
         OpenAPI_roaming_indication_e roaming_indication;
+        bool home_snssai_presence;
+        ogs_s_nssai_t home_snssai;
 
         char *ipv4addr;
         char *ipv6prefix;
+
+        bool home_plmn_id_presence;
+        ogs_plmn_id_t home_plmn_id;
+        bool tai_presence;
+        ogs_5gs_tai_t tai;
     } param;
 
     int res_status;
@@ -543,6 +565,18 @@
     OpenAPI_sm_context_update_error_t *SmContextUpdateError;
     OpenAPI_sm_context_release_data_t *SmContextReleaseData;
     OpenAPI_sm_context_released_data_t *SmContextReleasedData;
+    OpenAPI_pdu_session_create_data_t *PduSessionCreateData;
+    OpenAPI_pdu_session_created_data_t *PduSessionCreatedData;
+    OpenAPI_pdu_session_create_error_t *PduSessionCreateError;
+    OpenAPI_hsmf_update_data_t *HsmfUpdateData;
+    OpenAPI_hsmf_updated_data_t *HsmfUpdatedData;
+    OpenAPI_hsmf_update_error_t *HsmfUpdateError;
+    OpenAPI_vsmf_update_data_t *VsmfUpdateData;
+    OpenAPI_vsmf_updated_data_t *VsmfUpdatedData;
+    OpenAPI_vsmf_update_error_t *VsmfUpdateError;
+    OpenAPI_release_data_t *ReleaseData;
+    OpenAPI_released_data_t *ReleasedData;
+    OpenAPI_status_notification_t *StatusNotification;
     OpenAPI_list_t *SessionManagementSubscriptionDataList;
     OpenAPI_n1_n2_message_transfer_req_data_t *N1N2MessageTransferReqData;
     OpenAPI_n1_n2_message_transfer_rsp_data_t *N1N2MessageTransferRspData;
@@ -699,6 +733,11 @@
 int ogs_sbi_discovery_option_parse_plmn_list(
         ogs_plmn_id_t *plmn_list, char *v);
 
+void ogs_sbi_discovery_option_set_hnrf_uri(
+        ogs_sbi_discovery_option_t *discovery_option, char *hnrf_uri);
+void ogs_sbi_discovery_option_clear_hnrf_uri(
+        ogs_sbi_discovery_option_t *discovery_option);
+
 #ifdef __cplusplus
 }
 #endif

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/sbi/ogs-sbi.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/sbi/ogs-sbi.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -58,6 +58,17 @@
 #include "model/sm_context_update_error.h"
 #include "model/sm_context_release_data.h"
 #include "model/sm_context_released_data.h"
+#include "model/pdu_session_create_data.h"
+#include "model/pdu_session_create_error.h"
+#include "model/pdu_session_created_data.h"
+#include "model/hsmf_update_data.h"
+#include "model/hsmf_updated_data.h"
+#include "model/hsmf_update_error.h"
+#include "model/vsmf_update_data.h"
+#include "model/vsmf_updated_data.h"
+#include "model/vsmf_update_error.h"
+#include "model/release_data.h"
+#include "model/released_data.h"
 #include "model/session_management_subscription_data.h"
 #include "model/n1_n2_message_transfer_req_data.h"
 #include "model/n1_n2_message_transfer_rsp_data.h"
@@ -88,6 +99,7 @@
 #include "model/ue_context_transfer_rsp_data.h"
 #include "model/ue_reg_status_update_req_data.h"
 #include "model/ue_reg_status_update_rsp_data.h"
+#include "model/status_notification.h"
 
 #include "custom/links.h"

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/sbi/path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/sbi/path.c Changed

@@ -497,6 +497,13 @@
                 ogs_free(v);
             }
 
+            if (discovery_option && discovery_option->hnrf_uri) {
+                ogs_debug("hnrf_uri %s", discovery_option->hnrf_uri);
+                ogs_sbi_header_set(request->http.headers,
+                        OGS_SBI_CUSTOM_DISCOVERY_HNRF_URI,
+                        discovery_option->hnrf_uri);
+            }
+
             rc = ogs_sbi_client_send_via_scp_or_sepp(
                     scp_client, client_discover_cb, request,
                     OGS_UINT_TO_POINTER(xact->id));
@@ -510,9 +517,7 @@
          ***********************/
 
         /* If `client` instance is available, use direct communication */
-        rc = ogs_sbi_send_request_to_client(
-                client, ogs_sbi_client_handler, request,
-                OGS_UINT_TO_POINTER(xact->id));
+        rc = ogs_sbi_send_request_with_sepp_discovery(client, xact);
         ogs_expect(rc == true);
         return (rc == true) ? OGS_OK : OGS_ERROR;
 
@@ -590,15 +595,10 @@
 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;
 
-    ogs_sbi_object_t *sbi_object = NULL;
-
     ogs_assert(xact);
-    sbi_object = xact->sbi_object;
-    ogs_assert(sbi_object);
     request = xact->request;
     ogs_assert(request);
 
@@ -660,6 +660,21 @@
 #endif
     }
 
+    return ogs_sbi_send_request_with_sepp_discovery(client, xact);
+}
+
+bool ogs_sbi_send_request_with_sepp_discovery(
+        ogs_sbi_client_t *client, ogs_sbi_xact_t *xact)
+{
+    bool rc;
+    ogs_sbi_request_t *request = NULL;
+
+    ogs_assert(xact);
+    request = xact->request;
+    ogs_assert(request);
+
+    ogs_assert(client);
+
     if (client->fqdn && ogs_sbi_fqdn_in_vplmn(client->fqdn) == true) {
         ogs_sbi_client_t *sepp_client = NULL, *nrf_client = NULL;

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/lib/sbi/path.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/lib/sbi/path.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/meson.build -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/meson.build Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/amf-sm.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/amf-sm.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/context.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/context.c Changed

@@ -2372,10 +2372,12 @@
 
     if (sess->nssf.nsi_id)
         ogs_free(sess->nssf.nsi_id);
-    if (sess->nssf.nrf.id)
-        ogs_free(sess->nssf.nrf.id);
+    if (sess->nssf.nrf_uri)
+        ogs_free(sess->nssf.nrf_uri);
     if (sess->nssf.nrf.client)
         ogs_sbi_client_remove(sess->nssf.nrf.client);
+    if (sess->nssf.hnrf_uri)
+        ogs_free(sess->nssf.hnrf_uri);
 
     ogs_pool_id_free(&amf_sess_pool, sess);
 
@@ -2412,28 +2414,6 @@
     return ogs_pool_find_by_id(&amf_sess_pool, id);
 }
 
-void amf_sbi_select_nf(
-        ogs_sbi_object_t *sbi_object,
-        ogs_sbi_service_type_e service_type,
-        OpenAPI_nf_type_e requester_nf_type,
-        ogs_sbi_discovery_option_t *discovery_option)
-{
-    OpenAPI_nf_type_e target_nf_type = OpenAPI_nf_type_NULL;
-    ogs_sbi_nf_instance_t *nf_instance = NULL;
-
-    ogs_assert(sbi_object);
-    ogs_assert(service_type);
-    target_nf_type = ogs_sbi_service_type_to_nf_type(service_type);
-    ogs_assert(target_nf_type);
-    ogs_assert(requester_nf_type);
-
-    nf_instance = ogs_sbi_nf_instance_find_by_discovery_param(
-                    target_nf_type, requester_nf_type, discovery_option);
-    if (nf_instance)
-        OGS_SBI_SETUP_NF_INSTANCE(
-                sbi_object->service_type_arrayservice_type, nf_instance);
-}
-
 int amf_sess_xact_count(amf_ue_t *amf_ue)
 {
     amf_sess_t *sess = NULL;

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/context.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/context.h Changed

@@ -679,36 +679,37 @@
 
     uint8_t psi;            /* PDU Session Identity */
     uint8_t pti;            /* Procedure Trasaction Identity */
+    uint8_t request_type;   /* Request type */
 
 #define SESSION_CONTEXT_IN_SMF(__sESS)  \
-    ((__sESS) && (__sESS)->sm_context.ref)
+    ((__sESS) && (__sESS)->sm_context_ref)
 #define STORE_SESSION_CONTEXT(__sESS, __rESOURCE_URI, __rEF) \
     do { \
         ogs_assert(__sESS); \
         ogs_assert(__rESOURCE_URI); \
         ogs_assert(__rEF); \
         CLEAR_SESSION_CONTEXT(__sESS); \
-        (__sESS)->sm_context.resource_uri = ogs_strdup(__rESOURCE_URI); \
-        ogs_assert((__sESS)->sm_context.resource_uri); \
-        (__sESS)->sm_context.ref = ogs_strdup(__rEF); \
-        ogs_assert((__sESS)->sm_context.ref); \
+        (__sESS)->sm_context_resource_uri = ogs_strdup(__rESOURCE_URI); \
+        ogs_assert((__sESS)->sm_context_resource_uri); \
+        (__sESS)->sm_context_ref = ogs_strdup(__rEF); \
+        ogs_assert((__sESS)->sm_context_ref); \
     } while(0);
 #define CLEAR_SESSION_CONTEXT(__sESS) \
     do { \
         ogs_assert(__sESS); \
-        if ((__sESS)->sm_context.ref) \
-            ogs_free((__sESS)->sm_context.ref); \
-        (__sESS)->sm_context.ref = NULL; \
-        if ((__sESS)->sm_context.resource_uri) \
-            ogs_free((__sESS)->sm_context.resource_uri); \
-        (__sESS)->sm_context.resource_uri = NULL; \
+        if ((__sESS)->sm_context_ref) \
+            ogs_free((__sESS)->sm_context_ref); \
+        (__sESS)->sm_context_ref = NULL; \
+        if ((__sESS)->sm_context_resource_uri) \
+            ogs_free((__sESS)->sm_context_resource_uri); \
+        (__sESS)->sm_context_resource_uri = NULL; \
     } while(0);
 
     /* SMF sends the RESPONSE
      * of POST /nsmf-pdusession/v1/sm-contexts */
+    char *sm_context_resource_uri;
+    char *sm_context_ref;
     struct {
-        char *resource_uri;
-        char *ref;
         ogs_sbi_client_t *client;
     } sm_context;
 
@@ -894,10 +895,11 @@
 
     struct {
         char *nsi_id;
+        char *nrf_uri;
         struct {
-            char *id;
             ogs_sbi_client_t *client;
         } nrf;
+        char *hnrf_uri;
     } nssf;
 
     /* last payload for sending back to the UE */
@@ -915,6 +917,7 @@
     ogs_s_nssai_t mapped_hplmn;
     bool mapped_hplmn_presence;
     char *dnn;
+    bool lbo_roaming_allowed;
 
 } amf_sess_t;
 
@@ -1049,12 +1052,6 @@
 amf_ue_t *amf_ue_find_by_id(ogs_pool_id_t id);
 amf_sess_t *amf_sess_find_by_id(ogs_pool_id_t id);
 
-void amf_sbi_select_nf(
-        ogs_sbi_object_t *sbi_object,
-        ogs_sbi_service_type_e service_type,
-        OpenAPI_nf_type_e requester_nf_type,
-        ogs_sbi_discovery_option_t *discovery_option);
-
 #define AMF_SESSION_SYNC_DONE(__aMF, __sTATE) \
     (amf_sess_xact_state_count(__aMF, __sTATE) == 0)
 int amf_sess_xact_count(amf_ue_t *amf_ue);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/gmm-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/gmm-handler.c Changed

@@ -484,9 +484,17 @@
 
         ogs_list_for_each(&amf_ue->sess_list, sess) {
             if ((psimask & (1 << sess->psi)) == 0) {
-                if (SESSION_CONTEXT_IN_SMF(sess))
+                if (SESSION_CONTEXT_IN_SMF(sess)) {
+                    amf_nsmf_pdusession_sm_context_param_t param;
+
+                    memset(&param, 0, sizeof(param));
+                    param.ue_location = true;
+                    param.ue_timezone = true;
+
                     amf_sbi_send_release_session(
-                        ran_ue, sess, AMF_RELEASE_SM_CONTEXT_REGISTRATION_ACCEPT);
+                        ran_ue, sess,
+                        AMF_RELEASE_SM_CONTEXT_REGISTRATION_ACCEPT, &param);
+                }
             }
         }
     }
@@ -808,9 +816,17 @@
 
         ogs_list_for_each(&amf_ue->sess_list, sess) {
             if ((psimask & (1 << sess->psi)) == 0) {
-                if (SESSION_CONTEXT_IN_SMF(sess))
+                if (SESSION_CONTEXT_IN_SMF(sess)) {
+                    amf_nsmf_pdusession_sm_context_param_t param;
+
+                    memset(&param, 0, sizeof(param));
+                    param.ue_location = true;
+                    param.ue_timezone = true;
+
                     amf_sbi_send_release_session(
-                        ran_ue, sess, AMF_RELEASE_SM_CONTEXT_SERVICE_ACCEPT);
+                        ran_ue, sess,
+                        AMF_RELEASE_SM_CONTEXT_SERVICE_ACCEPT, &param);
+                }
             }
         }
     }
@@ -858,6 +874,7 @@
     int r, state, xact_count = 0;
     ran_ue_t *ran_ue = NULL;
     ogs_nas_de_registration_type_t *de_registration_type = NULL;
+    amf_nsmf_pdusession_sm_context_param_t param;
 
     ogs_assert(amf_ue);
     ran_ue = ran_ue_find_by_id(amf_ue->ran_ue_id);
@@ -892,7 +909,16 @@
     xact_count = amf_sess_xact_count(amf_ue);
 
     state = AMF_UE_INITIATED_DE_REGISTERED;
-    amf_sbi_send_release_all_sessions(ran_ue, amf_ue, state);
+
+    memset(&param, 0, sizeof(param));
+    param.cause = OpenAPI_cause_REL_DUE_TO_UNSPECIFIED_REASON;
+    param.ngApCause.group = NGAP_Cause_PR_nas;
+    param.ngApCause.value = NGAP_CauseNas_deregister;
+    param.gmm_cause = OGS_5GMM_CAUSE_REQUEST_ACCEPTED;
+    param.ue_location = true;
+    param.ue_timezone = true;
+
+    amf_sbi_send_release_all_sessions(ran_ue, amf_ue, state, &param);
 
     if (!AMF_SESSION_RELEASE_PENDING(amf_ue) &&
         amf_sess_xact_count(amf_ue) == xact_count) {
@@ -1140,11 +1166,11 @@
     int r;
     ogs_slice_data_t *selected_slice = NULL;
     amf_sess_t *sess = NULL;
-    amf_nsmf_pdusession_sm_context_param_t param;
 
     ogs_nas_payload_container_type_t *payload_container_type = NULL;
     ogs_nas_payload_container_t *payload_container = NULL;
     ogs_nas_pdu_session_identity_2_t *pdu_session_id = NULL;
+    ogs_nas_request_type_t *request_type = NULL;
     ogs_nas_s_nssai_t *nas_s_nssai = NULL;
     ogs_nas_dnn_t *dnn = NULL;
     ogs_nas_5gsm_header_t *gsm_header = NULL;
@@ -1206,6 +1232,8 @@
         return OGS_ERROR;
     }
 
+    request_type = &ul_nas_transport->request_type;
+
     switch (payload_container_type->value) {
     case OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION:
         gsm_header = (ogs_nas_5gsm_header_t *)payload_container->buffer;
@@ -1233,7 +1261,6 @@
              */
                 sess->pdu_session_resource_release_response_received = false;
                 sess->pdu_session_release_complete_received = false;
-
             }
         } else {
             sess = amf_sess_find_by_psi(amf_ue, *pdu_session_id);
@@ -1248,6 +1275,8 @@
             }
         }
 
+        sess->request_type = request_type->value;
+
         /*
          * To check if Reactivation Request has been used.
          *
@@ -1323,7 +1352,6 @@
 
                         if (ul_nas_transport->presencemask &
                                 OGS_NAS_5GS_UL_NAS_TRANSPORT_DNN_PRESENT) {
-
                             for (k = 0;
                                     k < amf_ue->slicei.num_of_session; k++) {
                                 if (k >= OGS_MAX_NUM_OF_SESS) {
@@ -1344,13 +1372,15 @@
                                     sess->dnn = ogs_strdup(dnn->value);
                                     ogs_assert(sess->dnn);
 
+                                    sess->lbo_roaming_allowed =
+                                        amf_ue->slicei.
+                                        sessionk.lbo_roaming_allowed;
                                 } else {
                                     continue;
                                 }
                             }
 
                         } else {
-
                             selected_slice = amf_ue->slice + i;
                             ogs_assert(selected_slice);
 
@@ -1360,6 +1390,9 @@
                                 sess->dnn = ogs_strdup(
                                         selected_slice->session0.name);
                                 ogs_assert(sess->dnn);
+                                sess->lbo_roaming_allowed =
+                                    amf_ue->slicei.
+                                    session0.lbo_roaming_allowed;
                             }
                         }
                     }
@@ -1380,70 +1413,223 @@
             sess->s_nssai.sst = selected_slice->s_nssai.sst;
             sess->s_nssai.sd.v = selected_slice->s_nssai.sd.v;
 
-            ogs_info("UE SUPI%s DNN%s S_NSSAISST:%d SD:0x%x "
+            ogs_info("UE SUPI%s DNN%s LBO%d S_NSSAISST:%d SD:0x%x "
                     "smContextRef%s smContextResourceURI%s",
-                amf_ue->supi, sess->dnn, sess->s_nssai.sst, sess->s_nssai.sd.v,
-                sess->sm_context.ref ? sess->sm_context.ref : "NULL",
-                sess->sm_context.resource_uri ?
-                    sess->sm_context.resource_uri : "NULL");
+                amf_ue->supi, sess->dnn, sess->lbo_roaming_allowed,
+                sess->s_nssai.sst, sess->s_nssai.sd.v,
+                sess->sm_context_ref ? sess->sm_context_ref : "NULL",
+                sess->sm_context_resource_uri ?
+                    sess->sm_context_resource_uri : "NULL");
 
             if (!SESSION_CONTEXT_IN_SMF(sess)) {
-                ogs_sbi_nf_instance_t *nf_instance = NULL;
-                ogs_sbi_service_type_e service_type =
-                    OGS_SBI_SERVICE_TYPE_NSMF_PDUSESSION;
-
-                ogs_sbi_discovery_option_t *discovery_option = NULL;
-
-                discovery_option = ogs_sbi_discovery_option_new();
-                ogs_assert(discovery_option);
+                ogs_sbi_nf_instance_t *v_smf_instance = NULL;
+                ogs_sbi_nf_instance_t *h_smf_instance = NULL;
+                ogs_sbi_discovery_option_t *v_discovery_option = NULL;
+
+                amf_nnssf_nsselection_param_t param;
+
+                ogs_sbi_service_type_e service_type = OGS_SBI_SERVICE_TYPE_NULL;
+                OpenAPI_nf_type_e target_nf_type = OpenAPI_nf_type_NULL;
+                OpenAPI_nf_type_e requester_nf_type = OpenAPI_nf_type_NULL;
+
+                service_type = OGS_SBI_SERVICE_TYPE_NSMF_PDUSESSION;
+                target_nf_type = ogs_sbi_service_type_to_nf_type(service_type);
+                ogs_assert(target_nf_type);
+                requester_nf_type = NF_INSTANCE_TYPE(
+                        ogs_sbi_self()->nf_instance);
+                ogs_assert(requester_nf_type);
+
+                int state = AMF_CREATE_SM_CONTEXT_NO_STATE;
+
+                /********************************************
+                 * Visited Discovery Option
+                 *******************************************/
+                v_discovery_option = ogs_sbi_discovery_option_new();
+                ogs_assert(v_discovery_option);
 
                 ogs_sbi_discovery_option_add_snssais(
-                        discovery_option, &sess->s_nssai);
-                ogs_sbi_discovery_option_set_dnn(discovery_option, sess->dnn);
+                        v_discovery_option, &sess->s_nssai);
+                ogs_sbi_discovery_option_set_dnn(
+                        v_discovery_option, sess->dnn);
                 ogs_sbi_discovery_option_set_tai(
-                        discovery_option, &amf_ue->nr_tai);
+                        v_discovery_option, &amf_ue->nr_tai);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/gmm-handler.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/gmm-handler.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/gmm-sm.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/gmm-sm.c Changed

@@ -86,6 +86,8 @@
 
     int r, state = 0, xact_count;
 
+    amf_nsmf_pdusession_sm_context_param_t param;
+
     ogs_assert(s);
     ogs_assert(e);
 
@@ -285,10 +287,10 @@
 
                 SWITCH(sbi_message->h.method)
                 CASE(OGS_SBI_HTTP_METHOD_POST)
-                    ogs_warn("%s Ignore SBI message", amf_ue->suci);
+                    ogs_error("%s Ignore SBI message", amf_ue->suci);
                     break;
                 CASE(OGS_SBI_HTTP_METHOD_PUT)
-                    ogs_warn("%s Ignore SBI message", amf_ue->suci);
+                    ogs_error("%s Ignore SBI message", amf_ue->suci);
                     break;
                 CASE(OGS_SBI_HTTP_METHOD_DELETE)
                     CLEAR_5G_AKA_CONFIRMATION(amf_ue);
@@ -316,7 +318,13 @@
                             AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED) {
 
                         xact_count = amf_sess_xact_count(amf_ue);
-                        amf_sbi_send_release_all_sessions(NULL, amf_ue, state);
+
+                        memset(&param, 0, sizeof(param));
+                        param.ue_location = true;
+                        param.ue_timezone = true;
+
+                        amf_sbi_send_release_all_sessions(
+                                NULL, amf_ue, state, &param);
 
                         if (!AMF_SESSION_RELEASE_PENDING(amf_ue) &&
                             amf_sess_xact_count(amf_ue) == xact_count) {
@@ -343,7 +351,7 @@
             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);
+                ogs_error("%s Ignore SBI message", amf_ue->supi);
                 break;
 
             DEFAULT
@@ -365,7 +373,7 @@
             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);
+                ogs_error("%s Ignore SBI message", amf_ue->supi);
                 break;
 
             CASE(OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS)
@@ -407,7 +415,7 @@
                     }
                     break;
                 DEFAULT
-                    ogs_warn("%s Ignore invalid HTTP method %s",
+                    ogs_error("%s Ignore invalid HTTP method %s",
                             amf_ue->suci, sbi_message->h.method);
                 END
                 break;
@@ -431,7 +439,7 @@
             CASE(OGS_SBI_RESOURCE_NAME_REGISTRATIONS)
                 SWITCH(sbi_message->h.method)
                 CASE(OGS_SBI_HTTP_METHOD_PUT)
-                    ogs_warn("%s Ignore SBI message", amf_ue->supi);
+                    ogs_error("%s Ignore SBI message", amf_ue->supi);
                     break;
                 CASE(OGS_SBI_HTTP_METHOD_PATCH)
                     SWITCH(sbi_message->h.resource.component2)
@@ -486,7 +494,7 @@
                         }
                         break;
                     DEFAULT
-                        ogs_warn("Ignoring invalid resource name %s",
+                        ogs_error("Ignoring invalid resource name %s",
                                  sbi_message->h.resource.component2);
                     END
                     break;
@@ -514,7 +522,7 @@
                         ogs_error("%s HTTP response error %d",
                                 amf_ue->supi, sbi_message->res_status);
                     }
-                    ogs_warn("%s Ignore SBI message", amf_ue->suci);
+                    ogs_error("%s Ignore SBI message", amf_ue->suci);
                     break;
 
                 CASE(OGS_SBI_HTTP_METHOD_DELETE)
@@ -602,9 +610,14 @@
                     }
 
                     xact_count = amf_sess_xact_count(amf_ue);
+
+                    memset(&param, 0, sizeof(param));
+                    param.ue_location = true;
+                    param.ue_timezone = true;
+
                     amf_sbi_send_release_all_sessions(
                             ran_ue_find_by_id(amf_ue->ran_ue_id), amf_ue,
-                            AMF_RELEASE_SM_CONTEXT_NO_STATE);
+                            AMF_RELEASE_SM_CONTEXT_NO_STATE, &param);
 
                     if (!AMF_SESSION_RELEASE_PENDING(amf_ue) &&
                         amf_sess_xact_count(amf_ue) == xact_count) {
@@ -653,6 +666,8 @@
 
     ogs_sbi_message_t *sbi_message = NULL;
 
+    amf_nsmf_pdusession_sm_context_param_t param;
+
     ogs_assert(s);
     ogs_assert(e);
 
@@ -883,10 +898,10 @@
 
                 SWITCH(sbi_message->h.method)
                 CASE(OGS_SBI_HTTP_METHOD_POST)
-                    ogs_warn("%s Ignore SBI message", amf_ue->suci);
+                    ogs_error("%s Ignore SBI message", amf_ue->suci);
                     break;
                 CASE(OGS_SBI_HTTP_METHOD_PUT)
-                    ogs_warn("%s Ignore SBI message", amf_ue->suci);
+                    ogs_error("%s Ignore SBI message", amf_ue->suci);
                     break;
                 CASE(OGS_SBI_HTTP_METHOD_DELETE)
                     CLEAR_5G_AKA_CONFIRMATION(amf_ue);
@@ -914,7 +929,13 @@
                             AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED) {
 
                         int xact_count = amf_sess_xact_count(amf_ue);
-                        amf_sbi_send_release_all_sessions(NULL, amf_ue, state);
+
+                        memset(&param, 0, sizeof(param));
+                        param.ue_location = true;
+                        param.ue_timezone = true;
+
+                        amf_sbi_send_release_all_sessions(
+                                NULL, amf_ue, state, &param);
 
                         if (!AMF_SESSION_RELEASE_PENDING(amf_ue) &&
                             amf_sess_xact_count(amf_ue) == xact_count) {
@@ -941,7 +962,7 @@
             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);
+                ogs_error("%s Ignore SBI message", amf_ue->supi);
                 break;
 
             DEFAULT
@@ -963,7 +984,7 @@
             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);
+                ogs_error("%s Ignore SBI message", amf_ue->supi);
                 break;
 
             CASE(OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS)
@@ -1035,7 +1056,7 @@
             CASE(OGS_SBI_RESOURCE_NAME_REGISTRATIONS)
                 SWITCH(sbi_message->h.method)
                 CASE(OGS_SBI_HTTP_METHOD_PUT)
-                    ogs_warn("%s Ignore SBI message", amf_ue->supi);
+                    ogs_error("%s Ignore SBI message", amf_ue->supi);
                     break;
                 CASE(OGS_SBI_HTTP_METHOD_PATCH)
                     SWITCH(sbi_message->h.resource.component2)
@@ -1081,9 +1102,12 @@
                                 ogs_assert(r != OGS_ERROR);
 
                             } else {
+                                memset(&param, 0, sizeof(param));
+                                param.ue_location = true;
+                                param.ue_timezone = true;
 
                                 amf_sbi_send_release_all_sessions(
-                                        NULL, amf_ue, state);
+                                        NULL, amf_ue, state, &param);
 
                                 if (!AMF_SESSION_RELEASE_PENDING(amf_ue) &&
                                     amf_sess_xact_count(amf_ue) == xact_count) {
@@ -1133,7 +1157,7 @@
                         ogs_error("%s HTTP response error %d",
                                 amf_ue->supi, sbi_message->res_status);
                     }
-                    ogs_warn("%s Ignore SBI message", amf_ue->suci);
+                    ogs_error("%s Ignore SBI message", amf_ue->suci);
                     break;
 
                 CASE(OGS_SBI_HTTP_METHOD_DELETE)
@@ -1239,9 +1263,14 @@
                     }
 
                     xact_count = amf_sess_xact_count(amf_ue);
+
+                    memset(&param, 0, sizeof(param));

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/namf-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/namf-handler.c Changed

@@ -287,7 +287,7 @@
                 header.resource.component1 = amf_ue->supi;
                 header.resource.component2 =
                     (char *)OGS_SBI_RESOURCE_NAME_N1_N2_MESSAGES;
-                header.resource.component3 = sess->sm_context.ref;
+                header.resource.component3 = sess->sm_context_ref;
 
                 sendmsg.http.location = ogs_sbi_server_uri(server, &header);
 
@@ -349,7 +349,7 @@
             header.resource.component1 = amf_ue->supi;
             header.resource.component2 =
                 (char *)OGS_SBI_RESOURCE_NAME_N1_N2_MESSAGES;
-            header.resource.component3 = sess->sm_context.ref;
+            header.resource.component3 = sess->sm_context_ref;
 
             sendmsg.http.location = ogs_sbi_server_uri(server, &header);
 
@@ -423,7 +423,7 @@
                 header.resource.component1 = amf_ue->supi;
                 header.resource.component2 =
                     (char *)OGS_SBI_RESOURCE_NAME_N1_N2_MESSAGES;
-                header.resource.component3 = sess->sm_context.ref;
+                header.resource.component3 = sess->sm_context_ref;
 
                 sendmsg.http.location = ogs_sbi_server_uri(server, &header);
 
@@ -1485,9 +1485,9 @@
         ogs_assert(sNSSAI);
 
         PduSessionContext->pdu_session_id = sess->psi;
-        ogs_assert(sess->sm_context.resource_uri);
+        ogs_assert(sess->sm_context_resource_uri);
         PduSessionContext->sm_context_ref =
-            ogs_strdup(sess->sm_context.resource_uri);
+            ogs_strdup(sess->sm_context_resource_uri);
 
         sNSSAI->sst = sess->s_nssai.sst;
         sNSSAI->sd = ogs_s_nssai_sd_to_string(sess->s_nssai.sd);
@@ -1812,9 +1812,9 @@
         ogs_freeaddrinfo(addr);
         ogs_freeaddrinfo(addr6);
 
-        sess->sm_context.resource_uri =
+        sess->sm_context_resource_uri =
             ogs_strdup(PduSessionContext->sm_context_ref);
-        sess->sm_context.ref =
+        sess->sm_context_ref =
             ogs_strdup(message.h.resource.component1);
 
         memset(&sess->s_nssai, 0, sizeof(sess->s_nssai));
@@ -1895,7 +1895,15 @@
                     uint8_t psi = *(double *)node->data;
                     sess = amf_sess_find_by_psi(amf_ue, psi);
                     if (SESSION_CONTEXT_IN_SMF(sess)) {
-                        amf_sbi_send_release_session(ran_ue, sess, AMF_RELEASE_SM_CONTEXT_NO_STATE);
+                        amf_nsmf_pdusession_sm_context_param_t param;
+
+                        memset(&param, 0, sizeof(param));
+                        param.ue_location = true;
+                        param.ue_timezone = true;
+
+                        amf_sbi_send_release_session(
+                                ran_ue, sess,
+                                AMF_RELEASE_SM_CONTEXT_NO_STATE, &param);
                     } else {
                         ogs_error("%s No Session Context PSI%d",
                                 amf_ue->supi, psi);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/ngap-path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/ngap-path.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/nnrf-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/nnrf-handler.c Changed

@@ -29,10 +29,15 @@
 
     ogs_sbi_nf_instance_t *nf_instance = NULL;
     ogs_sbi_object_t *sbi_object = NULL;
+    ogs_pool_id_t sbi_object_id = OGS_INVALID_POOL_ID;
     ogs_sbi_service_type_e service_type = OGS_SBI_SERVICE_TYPE_NULL;
+    OpenAPI_nf_type_e target_nf_type = OpenAPI_nf_type_NULL;
     OpenAPI_nf_type_e requester_nf_type = OpenAPI_nf_type_NULL;
     ogs_sbi_discovery_option_t *discovery_option = NULL;
 
+    amf_ue_t *amf_ue = NULL;
+    amf_sess_t *sess = NULL;
+
     OpenAPI_search_result_t *SearchResult = NULL;
 
     ogs_assert(recvmsg);
@@ -41,9 +46,15 @@
     ogs_assert(sbi_object);
     service_type = xact->service_type;
     ogs_assert(service_type);
+    target_nf_type = ogs_sbi_service_type_to_nf_type(service_type);
+    ogs_assert(target_nf_type);
     requester_nf_type = xact->requester_nf_type;
     ogs_assert(requester_nf_type);
 
+    sbi_object_id = xact->sbi_object_id;
+    ogs_assert(sbi_object_id >= OGS_MIN_POOL_ID &&
+            sbi_object_id <= OGS_MAX_POOL_ID);
+
     discovery_option = xact->discovery_option;
 
     SearchResult = recvmsg->SearchResult;
@@ -53,20 +64,25 @@
         return;
     }
 
-    ogs_nnrf_disc_handle_nf_discover_search_result(SearchResult);
-
-    amf_sbi_select_nf(sbi_object,
-            service_type, requester_nf_type, discovery_option);
+    if (sbi_object->type == OGS_SBI_OBJ_UE_TYPE) {
+        amf_ue = amf_ue_find_by_id(sbi_object_id);
+        ogs_assert(amf_ue);
+    } else if (sbi_object->type == OGS_SBI_OBJ_SESS_TYPE) {
+        sess = amf_sess_find_by_id(sbi_object_id);
+        ogs_assert(sess);
+        amf_ue = amf_ue_find_by_id(sess->amf_ue_id);
+        ogs_assert(amf_ue);
+    } else {
+        ogs_fatal("(NF discover) Not implemented %s:%d",
+            ogs_sbi_service_type_to_name(service_type), sbi_object->type);
+        ogs_assert_if_reached();
+    }
 
-    nf_instance = OGS_SBI_GET_NF_INSTANCE(
-            sbi_object->service_type_arrayservice_type);
+    ogs_nnrf_disc_handle_nf_discover_search_result(SearchResult);
 
+    nf_instance = ogs_sbi_nf_instance_find_by_discovery_param(
+                    target_nf_type, requester_nf_type, discovery_option);
     if (!nf_instance) {
-        amf_ue_t *amf_ue = NULL;
-        amf_sess_t *sess = NULL;
-
-        ogs_assert(sbi_object->type > OGS_SBI_OBJ_BASE &&
-                    sbi_object->type < OGS_SBI_OBJ_TOP);
         switch(sbi_object->type) {
         case OGS_SBI_OBJ_UE_TYPE:
             amf_ue = (amf_ue_t *)sbi_object;
@@ -107,9 +123,6 @@
             ogs_assert(r != OGS_ERROR);
             break;
         case OGS_SBI_OBJ_SESS_TYPE:
-            sess = (amf_sess_t *)sbi_object;
-            ogs_assert(sess);
-                        
             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) {
@@ -137,6 +150,9 @@
         return;
     }
 
+    OGS_SBI_SETUP_NF_INSTANCE(
+            sbi_object->service_type_arrayservice_type, nf_instance);
+
     ogs_expect(true == amf_sbi_send_request(nf_instance, xact));
 }

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/nnssf-build.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/nnssf-build.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -24,8 +24,14 @@
 {
     ogs_sbi_message_t message;
     ogs_sbi_request_t *request = NULL;
+    amf_nnssf_nsselection_param_t *param = data;
 
+    amf_ue_t *amf_ue = NULL;
+
+    ogs_assert(param);
     ogs_assert(sess);
+    amf_ue = amf_ue_find_by_id(sess->amf_ue_id);
+    ogs_assert(amf_ue);
 
     memset(&message, 0, sizeof(message));
     message.h.method = (char *)OGS_SBI_HTTP_METHOD_GET;
@@ -36,20 +42,60 @@
 
     message.param.nf_id = NF_INSTANCE_ID(ogs_sbi_self()->nf_instance);
     if (!message.param.nf_id) {
-        ogs_error("No nf_id");
+        ogs_error("No nf-id");
         goto end;
     }
     message.param.nf_type = NF_INSTANCE_TYPE(ogs_sbi_self()->nf_instance);
     if (!message.param.nf_type) {
-        ogs_error("No nf_type");
+        ogs_error("No nf-type");
+        goto end;
+    }
+
+    message.param.slice_info_for_pdu_session_presence =
+        param->slice_info_for_pdu_session.presence;
+
+    if (!message.param.slice_info_for_pdu_session_presence) {
+        ogs_error("No sliceInfoForPDUSession");
         goto end;
     }
 
-    message.param.slice_info_request_for_pdu_session_presence = true;
-    message.param.roaming_indication = OpenAPI_roaming_indication_NON_ROAMING;
-    memcpy(&message.param.s_nssai, &sess->s_nssai,
+    if (!param->slice_info_for_pdu_session.snssai) {
+        ogs_error("No sNssai");
+        goto end;
+    }
+
+    message.param.snssai_presence = true;
+    memcpy(&message.param.s_nssai,
+            param->slice_info_for_pdu_session.snssai,
             sizeof(message.param.s_nssai));
 
+    message.param.roaming_indication =
+        param->slice_info_for_pdu_session.roaming_indication;
+
+    if (!message.param.roaming_indication) {
+        ogs_error("No roamingIndication");
+        goto end;
+    }
+
+    if (param->slice_info_for_pdu_session.home_snssai) {
+        message.param.home_snssai_presence = true;
+        if (message.param.home_snssai_presence)
+            memcpy(&message.param.home_snssai,
+                    param->slice_info_for_pdu_session.home_snssai,
+                    sizeof(message.param.home_snssai));
+    }
+
+    if (param->home_plmn_id) {
+        message.param.home_plmn_id_presence = true;
+        memcpy(&message.param.home_plmn_id,
+                param->home_plmn_id, sizeof(message.param.home_plmn_id));
+    }
+
+    if (param->tai) {
+        message.param.tai_presence = true;
+        memcpy(&message.param.tai, param->tai, sizeof(message.param.tai));
+    }
+
     request = ogs_sbi_build_request(&message);
     ogs_expect(request);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/nnssf-build.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/nnssf-build.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/nnssf-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/nnssf-handler.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -22,10 +22,10 @@
 #include "sbi-path.h"
 
 int amf_nnssf_nsselection_handle_get(
-        amf_sess_t *sess, ogs_sbi_message_t *recvmsg)
+        amf_sess_t *sess, int state, ogs_sbi_message_t *recvmsg)
 {
     bool rc;
-    int r;
+    int r, i;
     OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
     ogs_sbi_client_t *client = NULL, *scp_client = NULL;
     char *fqdn = NULL;
@@ -39,6 +39,7 @@
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *ran_ue = NULL;
 
+    ogs_assert(state);
     ogs_assert(recvmsg);
     ogs_assert(!SESSION_CONTEXT_IN_SMF(sess));
 
@@ -97,6 +98,27 @@
         return OGS_ERROR;
     }
 
+    if (state == AMF_SMF_SELECTION_IN_HPLMN_IN_HOME_ROUTED) {
+        if (!sess->nssf.nrf_uri) {
+            ogs_error("No VPLMN nrf_uri");
+            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 (sess->nssf.hnrf_uri)
+            ogs_free(sess->nssf.hnrf_uri);
+        sess->nssf.hnrf_uri = ogs_strdup(NsiInformation->nrf_id);
+        ogs_assert(sess->nssf.hnrf_uri);
+    } else {
+        if (sess->nssf.nrf_uri)
+            ogs_free(sess->nssf.nrf_uri);
+        sess->nssf.nrf_uri = ogs_strdup(NsiInformation->nrf_id);
+        ogs_assert(sess->nssf.nrf_uri);
+    }
+
     discovery_option = ogs_sbi_discovery_option_new();
     ogs_assert(discovery_option);
 
@@ -104,18 +126,41 @@
     ogs_sbi_discovery_option_set_dnn(discovery_option, sess->dnn);
     ogs_sbi_discovery_option_set_tai(discovery_option, &amf_ue->nr_tai);
 
-    if (sess->nssf.nrf.id)
-        ogs_free(sess->nssf.nrf.id);
-    sess->nssf.nrf.id = ogs_strdup(NsiInformation->nrf_id);
-    ogs_assert(sess->nssf.nrf.id);
+    if (state == AMF_SMF_SELECTION_IN_HPLMN_IN_HOME_ROUTED) {
+        /*
+         * In order for Home Routed to find NRFs that are on HPLMN,
+         * we need to include Home PLMN information in the Discovery Option.
+         */
+        ogs_sbi_discovery_option_add_target_plmn_list(
+                discovery_option, &amf_ue->home_plmn_id);
+
+        ogs_assert(ogs_local_conf()->num_of_serving_plmn_id);
+        for (i = 0; i < ogs_local_conf()->num_of_serving_plmn_id; i++) {
+            ogs_sbi_discovery_option_add_requester_plmn_list(
+                    discovery_option,
+                    &ogs_local_conf()->serving_plmn_idi);
+        }
+
+        ogs_assert(sess->nssf.hnrf_uri);
+        ogs_sbi_discovery_option_set_hnrf_uri(
+                discovery_option, sess->nssf.hnrf_uri);
+    }
 
-    scp_client = NF_INSTANCE_CLIENT(ogs_sbi_self()->scp_instance);
+    /*
+     * SCP can only be used with Non-Roaming or LBO.
+     *
+     * In Home Routed, obtaining NRF from NSSF and selecting SMF
+     * cannot be done via SCP.
+     */
+    if (state == AMF_SMF_SELECTION_IN_VPLMN_IN_NON_ROAMING_OR_LBO)
+        scp_client = NF_INSTANCE_CLIENT(ogs_sbi_self()->scp_instance);
 
     if (scp_client) {
+        /* SCP can only be used with Non-Roaming or LBO. */
         amf_nsmf_pdusession_sm_context_param_t param;
 
         memset(&param, 0, sizeof(param));
-        param.nrf_uri.nrf.id = sess->nssf.nrf.id;
+        param.nrf_uri = sess->nssf.nrf_uri;
 
         r = amf_sess_sbi_discover_and_send(
                 OGS_SBI_SERVICE_TYPE_NSMF_PDUSESSION, discovery_option,
@@ -124,6 +169,10 @@
         ogs_expect(r == OGS_OK);
         ogs_assert(r != OGS_ERROR);
     } else {
+        /*
+         * In Home Routed, obtaining NRF from NSSF and selecting SMF
+         * cannot be done via SCP.
+         */
         rc = ogs_sbi_getaddr_from_uri(
                 &scheme, &fqdn, &fqdn_port, &addr, &addr6,
                 NsiInformation->nrf_id);
@@ -163,7 +212,7 @@
 
         r = amf_sess_sbi_discover_by_nsi(
                 ran_ue, sess,
-                OGS_SBI_SERVICE_TYPE_NSMF_PDUSESSION, discovery_option);
+                OGS_SBI_SERVICE_TYPE_NSMF_PDUSESSION, discovery_option, state);
         ogs_expect(r == OGS_OK);
         ogs_assert(r != OGS_ERROR);
     }

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/nnssf-handler.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/nnssf-handler.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/npcf-build.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/npcf-build.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/nsmf-build.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/nsmf-build.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -56,20 +56,6 @@
     memset(&header, 0, sizeof(header));
     memset(&ueLocation, 0, sizeof(ueLocation));
 
-    SmContextCreateData.serving_nf_id =
-        NF_INSTANCE_ID(ogs_sbi_self()->nf_instance);
-    if (!SmContextCreateData.serving_nf_id) {
-        ogs_error("No serving_nf_id");
-        goto end;
-    }
-
-    SmContextCreateData.serving_network =
-        ogs_sbi_build_plmn_id_nid(&amf_ue->nr_tai.plmn_id);
-    if (!SmContextCreateData.serving_nf_id) {
-        ogs_error("No serving_network");
-        goto end;
-    }
-
     SmContextCreateData.supi = amf_ue->supi;
     SmContextCreateData.pei = amf_ue->pei;
     if (amf_ue->num_of_msisdn) {
@@ -109,9 +95,7 @@
      * is absent, the serving core network operator shall be assumed.
      */
     if (ogs_sbi_plmn_id_in_vplmn(&amf_ue->home_plmn_id) == true) {
-        char *home_network_domain = NULL;
-
-        home_network_domain =
+        char *home_network_domain =
             ogs_home_network_domain_from_plmn_id(&amf_ue->home_plmn_id);
         ogs_assert(home_network_domain);
 
@@ -138,35 +122,35 @@
         SmContextCreateData.hplmn_snssai = &hplmnSnssai;
     }
 
+    SmContextCreateData.serving_nf_id =
+        NF_INSTANCE_ID(ogs_sbi_self()->nf_instance);
+    if (!SmContextCreateData.serving_nf_id) {
+        ogs_error("No serving_nf_id");
+        goto end;
+    }
+
     SmContextCreateData.guami = ogs_sbi_build_guami(amf_ue->guami);
     if (!SmContextCreateData.guami) {
         ogs_error("No guami");
         goto end;
     }
-    SmContextCreateData.an_type = amf_ue->nas.access_type; 
 
-    header.service.name = (char *)OGS_SBI_SERVICE_NAME_NAMF_CALLBACK;
-    header.api.version = (char *)OGS_SBI_API_V1;
-    header.resource.component0 = amf_ue->supi;
-    header.resource.component1 =
-        (char *)OGS_SBI_RESOURCE_NAME_SM_CONTEXT_STATUS;
-    header.resource.component2 = ogs_msprintf("%d", sess->psi);
-    if (!header.resource.component2) {
-        ogs_error("No header.resource.component2");
+    SmContextCreateData.serving_network =
+        ogs_sbi_build_plmn_id_nid(&amf_ue->nr_tai.plmn_id);
+    if (!SmContextCreateData.serving_network) {
+        ogs_error("No serving_network");
         goto end;
     }
 
-    server = ogs_sbi_server_first();
-    if (!server) {
-        ogs_error("No server");
-        goto end;
-    }
-    SmContextCreateData.sm_context_status_uri =
-        ogs_sbi_server_uri(server, &header);
+    if (sess->request_type >= OpenAPI_request_type_INITIAL_REQUEST &&
+            sess->request_type <=
+            OpenAPI_request_type_EXISTING_EMERGENCY_PDU_SESSION)
+        SmContextCreateData.request_type = sess->request_type;
 
     n1SmMsg.content_id = (char *)OGS_SBI_CONTENT_5GNAS_SM_ID;
     SmContextCreateData.n1_sm_msg = &n1SmMsg;
 
+    SmContextCreateData.an_type = amf_ue->nas.access_type;
     SmContextCreateData.rat_type = amf_ue_rat_type(amf_ue);
 
     ueLocation.nr_location = ogs_sbi_build_nr_location(
@@ -175,12 +159,9 @@
         ogs_error("No ueLocation.nr_location");
         goto end;
     }
-    ueLocation.nr_location->ue_location_timestamp =
-        ogs_sbi_gmtime_string(amf_ue->ue_location_timestamp);
-    if (!ueLocation.nr_location->ue_location_timestamp) {
-        ogs_error("No ue_location_timestamp");
-        goto end;
-    }
+    if (amf_ue->ue_location_timestamp)
+        ueLocation.nr_location->ue_location_timestamp =
+            ogs_sbi_gmtime_string(amf_ue->ue_location_timestamp);
 
     SmContextCreateData.ue_location = &ueLocation;
     SmContextCreateData.ue_time_zone = ogs_sbi_timezone_string(ogs_timezone());
@@ -189,6 +170,54 @@
         goto end;
     }
 
+    header.service.name = (char *)OGS_SBI_SERVICE_NAME_NAMF_CALLBACK;
+    header.api.version = (char *)OGS_SBI_API_V1;
+    header.resource.component0 = amf_ue->supi;
+    header.resource.component1 =
+        (char *)OGS_SBI_RESOURCE_NAME_SM_CONTEXT_STATUS;
+    header.resource.component2 = ogs_msprintf("%d", sess->psi);
+    if (!header.resource.component2) {
+        ogs_error("No header.resource.component2");
+        goto end;
+    }
+
+    server = ogs_sbi_server_first();
+    if (!server) {
+        ogs_error("No server");
+        goto end;
+    }
+    SmContextCreateData.sm_context_status_uri =
+        ogs_sbi_server_uri(server, &header);
+
+    if (ogs_sbi_plmn_id_in_vplmn(&amf_ue->home_plmn_id) == true) {
+        if (sess->lbo_roaming_allowed == false) {
+            ogs_sbi_nf_instance_t *h_smf_instance = NULL;
+            ogs_sbi_client_t *h_smf_client = NULL;
+            char *apiroot = NULL;
+
+            /* Home-Routed Roaming */
+            h_smf_instance = OGS_SBI_GET_NF_INSTANCE(
+                    sess->sbi.home_nsmf_pdusession);
+            ogs_assert(h_smf_instance);
+            h_smf_client = NF_INSTANCE_CLIENT(h_smf_instance);
+            ogs_assert(h_smf_client);
+
+            SmContextCreateData.h_smf_id = h_smf_instance->id;
+
+            apiroot = ogs_sbi_client_apiroot(h_smf_client);
+            ogs_assert(apiroot);
+
+            SmContextCreateData.h_smf_uri =
+                ogs_msprintf("%s/%s/%s/%s", apiroot,
+                        (char *)OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION,
+                        (char *)OGS_SBI_API_V1,
+                        (char *)OGS_SBI_RESOURCE_NAME_PDU_SESSIONS);
+            ogs_assert(SmContextCreateData.h_smf_uri);
+
+            ogs_free(apiroot);
+        }
+    }
+
     /*
      * We're experiencing an issue after changing SearchResult.validityTime
      * from 3600 seconds to 30 seconds. (#3210)
@@ -223,22 +252,10 @@
     message.http.accept = (char *)(OGS_SBI_CONTENT_JSON_TYPE ","
         OGS_SBI_CONTENT_NGAP_TYPE "," OGS_SBI_CONTENT_PROBLEM_TYPE);
 
-/*
- * Callback Header Configuration
- *
- * The 3gpp-Sbi-Callback HTTP header (per 3GPP TS 29.500 v17.9.0) indicates that
- * a message is an asynchronous notification or callback. This header should be
- * included only in HTTP POST requests that are callbacks (e.g., event or
- * notification messages) and must not be added to regular service requests,
- * such as registration (HTTP PUT) or subscription requests.
- */
-    message.http.custom.callback =
-        (char *)OGS_SBI_CALLBACK_NSMF_PDUSESSION_STATUS_NOTIFY;
-
-    if (param && param->nrf_uri.nrf.id) {
+    if (param && param->nrf_uri) {
         message.http.custom.nrf_uri =
             ogs_msprintf("%s: \"%s\"",
-                    OGS_SBI_SERVICE_NAME_NNRF_DISC, param->nrf_uri.nrf.id);
+                    OGS_SBI_SERVICE_NAME_NNRF_DISC, param->nrf_uri);
     }
 
     request = ogs_sbi_build_request(&message);
@@ -269,6 +286,9 @@
     if (SmContextCreateData.ue_time_zone)
         ogs_free(SmContextCreateData.ue_time_zone);
 
+    if (SmContextCreateData.h_smf_uri)
+        ogs_free(SmContextCreateData.h_smf_uri);
+
     if (message.http.custom.nrf_uri)
         ogs_free(message.http.custom.nrf_uri);
 
@@ -292,14 +312,14 @@
 
     ogs_assert(param);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/nsmf-build.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/nsmf-build.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/nsmf-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/nsmf-handler.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/nudm-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/nudm-handler.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/sbi-path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/sbi-path.c Changed

@@ -205,18 +205,25 @@
 static int client_discover_cb(
         int status, ogs_sbi_response_t *response, void *data)
 {
-    int r, rv;
+    int r, i, rv;
     ogs_sbi_message_t message;
 
+    ogs_sbi_nf_instance_t *nf_instance = NULL;
+
     ogs_sbi_xact_t *xact = NULL;
     ogs_pool_id_t xact_id = OGS_INVALID_POOL_ID;
     ogs_sbi_service_type_e service_type = OGS_SBI_SERVICE_TYPE_NULL;
+    OpenAPI_nf_type_e target_nf_type = OpenAPI_nf_type_NULL;
     OpenAPI_nf_type_e requester_nf_type = OpenAPI_nf_type_NULL;
     ogs_sbi_discovery_option_t *discovery_option = NULL;
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *ran_ue = NULL;
     amf_sess_t *sess = NULL;
 
+    ogs_sbi_discovery_option_t *v_discovery_option = NULL;
+
+    int current_state, next_state = AMF_CREATE_SM_CONTEXT_NO_STATE;
+
     xact_id = OGS_POINTER_TO_UINT(data);
     ogs_assert(xact_id >= OGS_MIN_POOL_ID && xact_id <= OGS_MAX_POOL_ID);
 
@@ -230,10 +237,15 @@
 
     service_type = xact->service_type;
     ogs_assert(service_type);
+    target_nf_type = ogs_sbi_service_type_to_nf_type(service_type);
+    ogs_assert(target_nf_type);
     requester_nf_type = xact->requester_nf_type;
     ogs_assert(requester_nf_type);
     discovery_option = xact->discovery_option;
 
+    current_state = xact->state;
+    ogs_assert(current_state);
+
     sess = amf_sess_find_by_id(xact->sbi_object_id);
     if (!sess) {
         ogs_error("Session has already been removed");
@@ -306,11 +318,9 @@
 
     ogs_nnrf_disc_handle_nf_discover_search_result(message.SearchResult);
 
-    amf_sbi_select_nf(&sess->sbi,
-            service_type, requester_nf_type, discovery_option);
-
-    if (!OGS_SBI_GET_NF_INSTANCE(
-                sess->sbi.service_type_arrayservice_type)) {
+    nf_instance = ogs_sbi_nf_instance_find_by_discovery_param(
+                    target_nf_type, requester_nf_type, discovery_option);
+    if (!nf_instance) {
         ogs_error("%s:%d (NF discover) No %s",
                     amf_ue->supi, sess->psi,
                     ogs_sbi_service_type_to_name(service_type));
@@ -323,12 +333,117 @@
         goto cleanup;
     }
 
-    r = amf_sess_sbi_discover_and_send(
-            service_type, NULL,
-            amf_nsmf_pdusession_build_create_sm_context,
-            ran_ue, sess, AMF_CREATE_SM_CONTEXT_NO_STATE, NULL);
-    ogs_expect(r == OGS_OK);
-    ogs_assert(r != OGS_ERROR);
+    v_discovery_option = ogs_sbi_discovery_option_new();
+    ogs_assert(v_discovery_option);
+
+    ogs_sbi_discovery_option_add_snssais(v_discovery_option, &sess->s_nssai);
+    ogs_sbi_discovery_option_set_dnn(v_discovery_option, sess->dnn);
+    ogs_sbi_discovery_option_set_tai(v_discovery_option, &amf_ue->nr_tai);
+
+    if (current_state == AMF_SMF_SELECTION_IN_VPLMN_IN_NON_ROAMING_OR_LBO) {
+        OGS_SBI_SETUP_NF_INSTANCE(
+                sess->sbi.service_type_arrayservice_type, nf_instance);
+
+    } else if (current_state == AMF_SMF_SELECTION_IN_VPLMN_IN_HOME_ROUTED) {
+        /* Home-Routed roaming */
+        ogs_sbi_nf_instance_t *h_smf_instance = NULL;
+
+        ogs_info("Home-Routed Roaming(VPLMN)");
+
+        OGS_SBI_SETUP_NF_INSTANCE(
+                sess->sbi.service_type_arrayservice_type, nf_instance);
+
+        h_smf_instance = OGS_SBI_GET_NF_INSTANCE(
+                sess->sbi.home_nsmf_pdusession);
+
+        if (!h_smf_instance) {
+            ogs_sbi_discovery_option_t *h_discovery_option =
+                ogs_sbi_discovery_option_new();
+            ogs_assert(h_discovery_option);
+
+            ogs_sbi_discovery_option_add_snssais(
+                    h_discovery_option, &sess->s_nssai);
+            ogs_sbi_discovery_option_set_dnn(
+                    h_discovery_option, sess->dnn);
+            ogs_sbi_discovery_option_set_tai(
+                    h_discovery_option, &amf_ue->nr_tai);
+
+            ogs_sbi_discovery_option_add_target_plmn_list(
+                    h_discovery_option, &amf_ue->home_plmn_id);
+
+            ogs_assert(ogs_local_conf()->num_of_serving_plmn_id);
+            for (i = 0; i < ogs_local_conf()->num_of_serving_plmn_id; i++) {
+                ogs_sbi_discovery_option_add_requester_plmn_list(
+                        h_discovery_option,
+                        &ogs_local_conf()->serving_plmn_idi);
+            }
+
+            h_smf_instance = ogs_sbi_nf_instance_find_by_discovery_param(
+                        target_nf_type, requester_nf_type, h_discovery_option);
+            if (h_smf_instance) {
+                ogs_info("H-SMF Instance %s(LIST)", h_smf_instance->id);
+                OGS_SBI_SETUP_NF_INSTANCE(
+                        sess->sbi.home_nsmf_pdusession, h_smf_instance);
+            } else
+                ogs_info("No H-SMF Instance");
+
+            ogs_sbi_discovery_option_free(h_discovery_option);
+        } else
+            ogs_info("H-SMF Instance %s(SESSION)", h_smf_instance->id);
+
+        if (h_smf_instance) {
+            /* Both V-SMF and H-SMF Discovered */
+            ogs_info("H-SMF Instance %s", h_smf_instance->id);
+        } else {
+            ogs_info("H-SMF not discovered");
+            next_state = AMF_SMF_SELECTION_IN_HPLMN_IN_HOME_ROUTED;
+        }
+    } else if (current_state == AMF_SMF_SELECTION_IN_HPLMN_IN_HOME_ROUTED) {
+        ogs_info("Home-Routed Roaming(HPLMN)");
+
+        OGS_SBI_SETUP_NF_INSTANCE(sess->sbi.home_nsmf_pdusession, nf_instance);
+    } else {
+        ogs_fatal("Invalid current_state = %d", current_state);
+        ogs_assert_if_reached();
+    }
+
+    if (next_state == AMF_SMF_SELECTION_IN_HPLMN_IN_HOME_ROUTED) {
+
+        amf_nnssf_nsselection_param_t param;
+
+        memset(&param, 0, sizeof(param));
+        param.slice_info_for_pdu_session.presence = true;
+        param.slice_info_for_pdu_session.snssai = &sess->s_nssai;
+        param.slice_info_for_pdu_session.roaming_indication =
+            OpenAPI_roaming_indication_HOME_ROUTED_ROAMING;
+        param.slice_info_for_pdu_session.home_snssai = &sess->s_nssai;
+        param.home_plmn_id = &amf_ue->home_plmn_id;
+        param.tai = &amf_ue->nr_tai;
+
+        /* No H-SMF Instance */
+        ogs_info("H-SMF not discovered");
+        r = amf_sess_sbi_discover_and_send(
+                OGS_SBI_SERVICE_TYPE_NNSSF_NSSELECTION, NULL,
+                amf_nnssf_nsselection_build_get, ran_ue, sess,
+                AMF_SMF_SELECTION_IN_HPLMN_IN_HOME_ROUTED, &param);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
+
+        ogs_sbi_discovery_option_free(v_discovery_option);
+
+    } else if (next_state == AMF_CREATE_SM_CONTEXT_NO_STATE) {
+
+        r = amf_sess_sbi_discover_and_send(
+                service_type, v_discovery_option,
+                amf_nsmf_pdusession_build_create_sm_context,
+                ran_ue, sess, next_state, NULL);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
+
+    } else {
+        ogs_error("Invalid NEXT state %d", next_state);
+        ogs_assert_if_reached();
+    }
 
     ogs_sbi_xact_remove(xact);
 
@@ -349,7 +464,7 @@
 int amf_sess_sbi_discover_by_nsi(
         ran_ue_t *ran_ue, amf_sess_t *sess,
         ogs_sbi_service_type_e service_type,
-        ogs_sbi_discovery_option_t *discovery_option)
+        ogs_sbi_discovery_option_t *discovery_option, int state)
 {
     ogs_sbi_xact_t *xact = NULL;
     ogs_sbi_client_t *client = NULL;
@@ -358,8 +473,9 @@
     client = sess->nssf.nrf.client;
     ogs_assert(client);
     ogs_assert(service_type);
+    ogs_assert(state);
 
-    ogs_warn("Try to discover %s",
+    ogs_warn("Try to discover by NsiInformation %s",
                 ogs_sbi_service_type_to_name(service_type));

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/amf/sbi-path.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/amf/sbi-path.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -64,6 +64,14 @@
 #define AMF_REMOVE_S1_CONTEXT_BY_RESET_ALL              52
 #define AMF_REMOVE_S1_CONTEXT_BY_RESET_PARTIAL          53
 
+/*
+ * TS23.502
+ * 4.3.2.2.3 SMF selection
+ */
+#define AMF_SMF_SELECTION_IN_VPLMN_IN_NON_ROAMING_OR_LBO    1
+#define AMF_SMF_SELECTION_IN_VPLMN_IN_HOME_ROUTED           2
+#define AMF_SMF_SELECTION_IN_HPLMN_IN_HOME_ROUTED           3
+
 int amf_ue_sbi_discover_and_send(
         ogs_sbi_service_type_e service_type,
         ogs_sbi_discovery_option_t *discovery_option,
@@ -78,7 +86,7 @@
 int amf_sess_sbi_discover_by_nsi(
         ran_ue_t *ran_ue, amf_sess_t *sess,
         ogs_sbi_service_type_e service_type,
-        ogs_sbi_discovery_option_t *discovery_option);
+        ogs_sbi_discovery_option_t *discovery_option, int state);
 
 void amf_sbi_send_activating_session(
         ran_ue_t *ran_ue, amf_sess_t *sess, int state);
@@ -90,9 +98,9 @@
 void amf_sbi_send_deactivate_all_ue_in_gnb(amf_gnb_t *gnb, int state);
 
 void amf_sbi_send_release_session(
-        ran_ue_t *ran_ue, amf_sess_t *sess, int state);
+        ran_ue_t *ran_ue, amf_sess_t *sess, int state, void *data);
 void amf_sbi_send_release_all_sessions(
-        ran_ue_t *ran_ue, amf_ue_t *amf_ue, int state);
+        ran_ue_t *ran_ue, amf_ue_t *amf_ue, int state, void *data);
 
 bool amf_sbi_send_n1_n2_failure_notify(
         amf_sess_t *sess, OpenAPI_n1_n2_message_transfer_cause_e cause);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/mme/nas-path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/mme/nas-path.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/nrf/nnrf-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nrf/nnrf-handler.c Changed

@@ -1028,6 +1028,9 @@
                     ogs_plmn_id_mnc(
                         &discovery_option->requester_plmn_listi));
         }
+        if (discovery_option->hnrf_uri) {
+            ogs_debug("hnrf_uri%s", discovery_option->hnrf_uri);
+        }
         if (discovery_option->requester_features) {
             ogs_debug("requester-features0x%llx",
                 (long long)discovery_option->requester_features);
@@ -1062,11 +1065,12 @@
         if (recvmsg->param.limit && i >= recvmsg->param.limit)
             break;
 
-        ogs_debug("%s:%d NF-Discovered NF-Type:%s,NF-Status:%s,"
-                "IPv4:%d,IPv6:%d", nf_instance->id, i,
+        ogs_info("%s:%d NF-Discovered NF-Type:%s,NF-Status:%s,"
+                "IPv4:%d,IPv6:%d,FQDN:%s", nf_instance->id, i,
                 OpenAPI_nf_type_ToString(nf_instance->nf_type),
                 OpenAPI_nf_status_ToString(nf_instance->nf_status),
-                nf_instance->num_of_ipv4, nf_instance->num_of_ipv6);
+                nf_instance->num_of_ipv4, nf_instance->num_of_ipv6,
+                nf_instance->fqdn ? nf_instance->fqdn : "NULL");
 
         NFProfile = ogs_nnrf_nfm_build_nf_profile(
                 nf_instance, NULL, discovery_option,
@@ -1133,6 +1137,16 @@
                         nf_instance, discovery_option) == false)
                 continue;
 
+            /*
+             * NRFs in Home PLMN are categorized into those with and without
+             * hnrf-uri. Since Open5GS includes hnrf-uri in the Discovery
+             * message, NRFs must be differentiated based on the presence or
+             * absence of hnrf-uri, so the following match routine is used.
+             */
+            if (ogs_sbi_discovery_option_hnrf_uri_is_matched(
+                        nf_instance, discovery_option) == false)
+                continue;
+
             break;
         }
 
@@ -1154,10 +1168,63 @@
             nf_instance->num_of_plmn_id =
                 discovery_option->num_of_target_plmn_list;
 
-            nf_instance->fqdn = ogs_nrf_fqdn_from_plmn_id(nf_instance->plmn_id);
-            ogs_assert(nf_instance->fqdn);
+            /*
+             * NRFs with a Home PLMN can use the target_plmn information
+             * to extract the FQDN. However, the standards documentation
+             * describes hnrf-uri, so if hnrf-uri is included in discovery,
+             * we implement it so that the FQDN of an NRF with a Home PLMN
+             * is created using hnrf-uri.
+             */
+            if (discovery_option->hnrf_uri) {
+                OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
+                char *fqdn = NULL;
+                uint16_t fqdn_port = 0;
+                ogs_sockaddr_t *addr = NULL, *addr6 = NULL;
+
+                rc = ogs_sbi_getaddr_from_uri(
+                        &scheme, &fqdn, &fqdn_port, &addr, &addr6,
+                        discovery_option->hnrf_uri);
+                if (rc == false || scheme == OpenAPI_uri_scheme_NULL)
+                    ogs_error("Invalid URL %s", request->h.uri);
+                else {
+            /*
+             * If there is an hnrf-uri, this value creates an nf-instance->fqdn,
+             * which in turn creates a client->fqdn from the hnrf-uri.
+             */
+                    nf_instance->hnrf_uri =
+                        ogs_strdup(discovery_option->hnrf_uri);
+                    nf_instance->fqdn = ogs_strdup(fqdn);
+
+                    ogs_free(fqdn);
+                    ogs_freeaddrinfo(addr);
+                    ogs_freeaddrinfo(addr6);
+                }
+            }
+
+            if (!nf_instance->fqdn) {
+                nf_instance->fqdn =
+                    ogs_nrf_fqdn_from_plmn_id(nf_instance->plmn_id);
+                ogs_assert(nf_instance->fqdn);
+            }
 
+            /*
+             * At this stage, the client->fqdn is set and this is
+             * passed through to the Target-apiRoot to the Home PLMN.
+             *
+             * As mentioned above, if there is an hnrf-uri, this value creates
+             * an nf-instance->fqdn, which in turn creates a client->fqdn
+             * from the hnrf-uri.
+             */
             ogs_sbi_client_associate(nf_instance);
+
+            ogs_info("New NRF fqdn:%s, hnrf_uri:%s",
+                    nf_instance->fqdn ? nf_instance->fqdn : "NULL",
+                    nf_instance->hnrf_uri ? nf_instance->hnrf_uri : "NULL");
+
+        } else {
+            ogs_info("NRF Found fqdn:%s, hnrf_uri:%s",
+                    nf_instance->fqdn ? nf_instance->fqdn : "NULL",
+                    nf_instance->hnrf_uri ? nf_instance->hnrf_uri : "NULL");
         }
 
         client = NF_INSTANCE_CLIENT(nf_instance);
@@ -1165,7 +1232,7 @@
 
         /*
          * TS29.510
-         * 5.3.2.4 Service Discovery in a different PLMN
+         * 5.3.2.2.3 Service Discovery in a different PLMN
          *
          * Then, steps 1-2 in Figure 5.3.2.2.3-1 are executed,
          * between the NRF in the Serving PLMN and the NRF in the Home PLMN.
@@ -1173,6 +1240,7 @@
          * in the query parameter of the URI is not required.
          */
         discovery_option->num_of_target_plmn_list = 0;
+        ogs_sbi_discovery_option_clear_hnrf_uri(discovery_option);
 
         assoc = nrf_assoc_add(stream);
         if (!assoc) {

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/nssf/context.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nssf/context.c Changed

@@ -24,6 +24,7 @@
 int __nssf_log_domain;
 
 static OGS_POOL(nssf_nsi_pool, nssf_nsi_t);
+static OGS_POOL(nssf_home_pool, nssf_home_t);
 
 static int context_initialized = 0;
 
@@ -37,6 +38,7 @@
     ogs_log_install_domain(&__nssf_log_domain, "nssf", ogs_core()->log.level);
 
     ogs_pool_init(&nssf_nsi_pool, ogs_app()->pool.nf);
+    ogs_pool_init(&nssf_home_pool, ogs_app()->pool.nf);
 
     context_initialized = 1;
 }
@@ -46,8 +48,10 @@
     ogs_assert(context_initialized == 1);
 
     nssf_nsi_remove_all();
+    nssf_home_remove_all();
 
     ogs_pool_final(&nssf_nsi_pool);
+    ogs_pool_final(&nssf_home_pool);
 
     context_initialized = 0;
 }
@@ -344,6 +348,75 @@
     return NULL;
 }
 
+nssf_home_t *nssf_home_add(ogs_plmn_id_t *plmn_id, ogs_s_nssai_t *s_nssai)
+{
+    nssf_home_t *home = NULL;
+
+    ogs_assert(plmn_id);
+    ogs_assert(s_nssai);
+
+    ogs_pool_id_calloc(&nssf_home_pool, &home);
+    if (home == NULL) {
+        ogs_error("Could not allocate home context from pool");
+        return NULL;
+    }
+
+    memcpy(&home->plmn_id, plmn_id, sizeof(ogs_plmn_id_t));
+    memcpy(&home->s_nssai, s_nssai, sizeof(ogs_s_nssai_t));
+
+    ogs_list_add(&self.home_list, home);
+
+    return home;
+}
+
+void nssf_home_remove(nssf_home_t *home)
+{
+    ogs_assert(home);
+
+    ogs_list_remove(&self.home_list, home);
+
+    if (home->nrf_id)
+        ogs_free(home->nrf_id);
+
+    if (home->nsi_id)
+        ogs_free(home->nsi_id);
+
+    /* Free SBI object memory */
+    ogs_sbi_object_free(&home->sbi);
+
+    ogs_pool_id_free(&nssf_home_pool, home);
+}
+
+void nssf_home_remove_all(void)
+{
+    nssf_home_t *home = NULL, *next_home = NULL;
+
+    ogs_list_for_each_safe(&self.home_list, next_home, home)
+        nssf_home_remove(home);
+}
+
+nssf_home_t *nssf_home_find(ogs_plmn_id_t *plmn_id, ogs_s_nssai_t *s_nssai)
+{
+    nssf_home_t *home = NULL;
+
+    ogs_assert(plmn_id);
+    ogs_assert(s_nssai);
+
+    ogs_list_for_each(&self.home_list, home) {
+        if (memcmp(&home->plmn_id, plmn_id, sizeof(ogs_plmn_id_t)) == 0 &&
+            memcmp(&home->s_nssai, s_nssai, sizeof(ogs_s_nssai_t)) == 0) {
+            return home;
+        }
+    }
+
+    return NULL;
+}
+
+nssf_home_t *nssf_home_find_by_id(ogs_pool_id_t id)
+{
+    return ogs_pool_find_by_id(&nssf_home_pool, id);
+}
+
 int get_nsi_load(void)
 {
     return (((ogs_pool_size(&nssf_nsi_pool) -

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/nssf/context.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nssf/context.h Changed

@@ -36,6 +36,7 @@
 
 typedef struct nssf_context_s {
     ogs_list_t      nsi_list; /* NSI List */
+    ogs_list_t      home_list; /* Home List for HR-Roaming*/
 } nssf_context_t;
 
 void nssf_context_init(void);
@@ -51,13 +52,34 @@
     char *nsi_id;
 
     ogs_s_nssai_t s_nssai;
+    OpenAPI_roaming_indication_e roaming_indication;
+
+    bool tai_presence;
+    ogs_5gs_tai_t tai;
 } nssf_nsi_t;
 
+typedef struct nssf_home_s {
+    ogs_sbi_object_t sbi;
+    ogs_pool_id_t id;
+
+    ogs_plmn_id_t plmn_id;
+    ogs_s_nssai_t s_nssai;
+
+    char *nrf_id;
+    char *nsi_id;
+} nssf_home_t;
+
 nssf_nsi_t *nssf_nsi_add(char *nrf_id, uint8_t sst, ogs_uint24_t sd);
 void nssf_nsi_remove(nssf_nsi_t *nsi);
 void nssf_nsi_remove_all(void);
 nssf_nsi_t *nssf_nsi_find_by_s_nssai(ogs_s_nssai_t *s_nssai);
 
+nssf_home_t *nssf_home_add(ogs_plmn_id_t *plmn_id, ogs_s_nssai_t *s_nssai);
+void nssf_home_remove(nssf_home_t *home);
+void nssf_home_remove_all(void);
+nssf_home_t *nssf_home_find(ogs_plmn_id_t *plmn_id, ogs_s_nssai_t *s_nssai);
+nssf_home_t *nssf_home_find_by_id(ogs_pool_id_t id);
+
 int get_nsi_load(void);
 
 #ifdef __cplusplus

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/nssf/meson.build -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nssf/meson.build Changed

open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nssf/nnrf-handler.c Added

@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2019-2024 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 "sbi-path.h"
+#include "nnrf-handler.h"
+
+void nssf_nnrf_handle_nf_discover(
+        ogs_sbi_xact_t *xact, ogs_sbi_message_t *recvmsg)
+{
+    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;
+    ogs_sbi_discovery_option_t *discovery_option = NULL;
+
+    OpenAPI_nf_type_e target_nf_type = OpenAPI_nf_type_NULL;
+    OpenAPI_nf_type_e requester_nf_type = OpenAPI_nf_type_NULL;
+    OpenAPI_search_result_t *SearchResult = NULL;
+
+    ogs_assert(recvmsg);
+    ogs_assert(xact);
+    sbi_object = xact->sbi_object;
+    ogs_assert(sbi_object);
+    service_type = xact->service_type;
+    ogs_assert(service_type);
+    target_nf_type = ogs_sbi_service_type_to_nf_type(service_type);
+    ogs_assert(target_nf_type);
+    requester_nf_type = xact->requester_nf_type;
+    ogs_assert(requester_nf_type);
+
+    discovery_option = xact->discovery_option;
+
+    SearchResult = recvmsg->SearchResult;
+    if (!SearchResult) {
+        ogs_error("No SearchResult");
+        return;
+    }
+
+    ogs_nnrf_disc_handle_nf_discover_search_result(SearchResult);
+
+    nf_instance = ogs_sbi_nf_instance_find_by_discovery_param(
+                    target_nf_type, requester_nf_type, discovery_option);
+    if (!nf_instance) {
+        ogs_error("(NF discover) No %s:%s",
+                    ogs_sbi_service_type_to_name(service_type),
+                    OpenAPI_nf_type_ToString(requester_nf_type));
+        return;
+    }
+
+    OGS_SBI_SETUP_NF_INSTANCE(
+            sbi_object->service_type_arrayservice_type, nf_instance);
+
+    ogs_expect(true == nssf_sbi_send_request(nf_instance, xact));
+}

open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nssf/nnrf-handler.h Added

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2019-2024 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/>.
+ */
+
+#ifndef NSSF_NNRF_HANDLER_H
+#define NSSF_NNRF_HANDLER_H
+
+#include "context.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void nssf_nnrf_handle_nf_discover(
+        ogs_sbi_xact_t *xact, ogs_sbi_message_t *recvmsg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NSSF_NNRF_HANDLER_H */

open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nssf/nnssf-build.c Added

@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2019-2024 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 "nnssf-build.h"
+
+ogs_sbi_request_t *nssf_nnssf_nsselection_build_get(
+        nssf_home_t *home, void *data)
+{
+    ogs_sbi_message_t message;
+    ogs_sbi_request_t *request = NULL;
+    nssf_nnssf_nsselection_param_t *param = data;
+
+    ogs_assert(param);
+    ogs_assert(home);
+
+    memset(&message, 0, sizeof(message));
+    message.h.method = (char *)OGS_SBI_HTTP_METHOD_GET;
+    message.h.service.name = (char *)OGS_SBI_SERVICE_NAME_NNSSF_NSSELECTION;
+    message.h.api.version = (char *)OGS_SBI_API_V2;
+    message.h.resource.component0 =
+        (char *)OGS_SBI_RESOURCE_NAME_NETWORK_SLICE_INFORMATION;
+
+    message.param.nf_id = NF_INSTANCE_ID(ogs_sbi_self()->nf_instance);
+    if (!message.param.nf_id) {
+        ogs_error("No nf-id");
+        goto end;
+    }
+    message.param.nf_type = NF_INSTANCE_TYPE(ogs_sbi_self()->nf_instance);
+    if (!message.param.nf_type) {
+        ogs_error("No nf-type");
+        goto end;
+    }
+
+    message.param.slice_info_for_pdu_session_presence =
+        param->slice_info_for_pdu_session.presence;
+
+    if (!message.param.slice_info_for_pdu_session_presence) {
+        ogs_error("No sliceInfoForPDUSession");
+        goto end;
+    }
+
+    if (!param->slice_info_for_pdu_session.snssai) {
+        ogs_error("No sNssai");
+        goto end;
+    }
+
+    message.param.snssai_presence = true;
+    memcpy(&message.param.s_nssai,
+            param->slice_info_for_pdu_session.snssai,
+            sizeof(message.param.s_nssai));
+
+    message.param.roaming_indication =
+        param->slice_info_for_pdu_session.roaming_indication;
+
+    if (!message.param.roaming_indication) {
+        ogs_error("No roamingIndication");
+        goto end;
+    }
+
+    if (param->tai) {
+        message.param.tai_presence = true;
+        memcpy(&message.param.tai, param->tai, sizeof(message.param.tai));
+    }
+
+    request = ogs_sbi_build_request(&message);
+    ogs_expect(request);
+
+end:
+
+    return request;
+}

open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nssf/nnssf-build.h Added

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2019-2024 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/>.
+ */
+
+#ifndef AMF_NNSSF_BUILD_H
+#define AMF_NNSSF_BUILD_H
+
+#include "context.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct nssf_nnssf_nsselection_param_s {
+    struct {
+        bool presence;
+        ogs_s_nssai_t *snssai;
+        OpenAPI_roaming_indication_e roaming_indication;
+    } slice_info_for_pdu_session;
+    ogs_5gs_tai_t *tai;
+} nssf_nnssf_nsselection_param_t;
+
+ogs_sbi_request_t *nssf_nnssf_nsselection_build_get(
+        nssf_home_t *home, void *data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* AMF_NNSSF_BUILD_H */

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/nssf/nnssf-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nssf/nnssf-handler.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -21,7 +21,7 @@
 #include "nnrf-handler.h"
 #include "nnssf-handler.h"
 
-bool nssf_nnrf_nsselection_handle_get(
+bool nssf_nnrf_nsselection_handle_get_from_amf_or_vnssf(
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
     int status = OGS_SBI_HTTP_STATUS_OK;
@@ -50,12 +50,24 @@
         goto cleanup;
     }
 
-    if (!recvmsg->param.slice_info_request_for_pdu_session_presence) {
+    if (!recvmsg->param.slice_info_for_pdu_session_presence) {
         status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
         strerror = ogs_msprintf("Not implemented except PDU session");
         goto cleanup;
     }
 
+    if (!recvmsg->param.snssai_presence) {
+        status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+        strerror = ogs_msprintf("No sNssai");
+        goto cleanup;
+    }
+
+    if (!recvmsg->param.roaming_indication) {
+        status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+        strerror = ogs_msprintf("No roamingIndication");
+        goto cleanup;
+    }
+
     nsi = nssf_nsi_find_by_s_nssai(&recvmsg->param.s_nssai);
     if (!nsi) {
         status = OGS_SBI_HTTP_STATUS_FORBIDDEN;
@@ -64,9 +76,78 @@
         goto cleanup;
     }
 
+    nsi->roaming_indication = recvmsg->param.roaming_indication;
+
+    if (recvmsg->param.tai_presence) {
+        nsi->tai_presence = true;
+        memcpy(&nsi->tai, &recvmsg->param.tai, sizeof(nsi->tai));
+    }
+
     memset(&NsiInformation, 0, sizeof(NsiInformation));
-    NsiInformation.nrf_id = nsi->nrf_id;
-    NsiInformation.nsi_id = nsi->nsi_id;
+
+    if (recvmsg->param.home_plmn_id_presence &&
+            recvmsg->param.home_snssai_presence) {
+        nssf_home_t *home = nssf_home_find(
+                &recvmsg->param.home_plmn_id, &recvmsg->param.home_snssai);
+        if (!home) {
+            home = nssf_home_add(
+                    &recvmsg->param.home_plmn_id, &recvmsg->param.home_snssai);
+            if (!home) {
+                status = OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR;
+                strerror = ogs_msprintf("Cannot allocate Home Network "
+                        "by PLMN-ID(0x%x) S-NSSAISST:%d SD:0x%x",
+                        ogs_plmn_id_hexdump(&recvmsg->param.home_plmn_id),
+                        recvmsg->param.home_snssai.sst,
+                        recvmsg->param.home_snssai.sd.v);
+                goto cleanup;
+            }
+        }
+
+        if (!home->nrf_id || !home->nsi_id) {
+            int r, i;
+            nssf_nnssf_nsselection_param_t param;
+            ogs_sbi_discovery_option_t *h_discovery_option = NULL;
+
+            h_discovery_option = ogs_sbi_discovery_option_new();
+            ogs_assert(h_discovery_option);
+
+            ogs_sbi_discovery_option_add_snssais(
+                    h_discovery_option, &home->s_nssai);
+            ogs_sbi_discovery_option_add_target_plmn_list(
+                    h_discovery_option, &home->plmn_id);
+            ogs_assert(ogs_local_conf()->num_of_serving_plmn_id);
+            for (i = 0; i < ogs_local_conf()->num_of_serving_plmn_id; i++) {
+                ogs_sbi_discovery_option_add_requester_plmn_list(
+                        h_discovery_option,
+                        &ogs_local_conf()->serving_plmn_idi);
+            }
+
+            memset(&param, 0, sizeof(param));
+            param.slice_info_for_pdu_session.presence = true;
+            param.slice_info_for_pdu_session.snssai = &home->s_nssai;
+            param.slice_info_for_pdu_session.roaming_indication =
+                nsi->roaming_indication;
+
+            if (nsi->tai_presence) param.tai = &nsi->tai;
+
+            r = nssf_sbi_discover_and_send(
+                    OGS_SBI_SERVICE_TYPE_NNSSF_NSSELECTION, h_discovery_option,
+                    nssf_nnssf_nsselection_build_get,
+                    home, stream, &param);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
+
+            return true;
+        }
+
+        /* Home Network */
+        NsiInformation.nrf_id = home->nrf_id;
+        NsiInformation.nsi_id = home->nsi_id;
+    } else {
+        /* Serving Network */
+        NsiInformation.nrf_id = nsi->nrf_id;
+        NsiInformation.nsi_id = nsi->nsi_id;
+    }
 
     memset(&AuthorizedNetworkSliceInfo, 0, sizeof(AuthorizedNetworkSliceInfo));
     AuthorizedNetworkSliceInfo.nsi_information = &NsiInformation;
@@ -76,6 +157,81 @@
 
     response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK);
     ogs_assert(response);
+    ogs_assert(true == ogs_sbi_server_send_response(stream, response));
+
+    return true;
+
+cleanup:
+    ogs_assert(strerror);
+
+    ogs_error("%s", strerror);
+    ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL,
+            NULL);
+    ogs_free(strerror);
+
+    return false;
+}
+
+bool nssf_nnrf_nsselection_handle_get_from_hnssf(
+        nssf_home_t *home,
+        ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
+{
+    int status = OGS_SBI_HTTP_STATUS_OK;
+    char *strerror = NULL;
+
+    OpenAPI_authorized_network_slice_info_t *AuthorizedNetworkSliceInfo = NULL;
+    OpenAPI_nsi_information_t *NsiInformation = NULL;
+
+    ogs_sbi_message_t sendmsg;
+    ogs_sbi_response_t *response = NULL;
+
+    ogs_assert(home);
+    ogs_assert(stream);
+    ogs_assert(recvmsg);
+
+    if (recvmsg->res_status != OGS_SBI_HTTP_STATUS_OK) {
+        status = recvmsg->res_status;
+        strerror = ogs_msprintf("HTTP response error %d",
+                recvmsg->res_status);
+        goto cleanup;
+    }
+
+    AuthorizedNetworkSliceInfo = recvmsg->AuthorizedNetworkSliceInfo;
+    if (!AuthorizedNetworkSliceInfo) {
+        status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+        strerror = ogs_msprintf("No AuthorizedNetworkSliceInfo");
+        goto cleanup;
+    }
+
+    NsiInformation = AuthorizedNetworkSliceInfo->nsi_information;
+    if (!NsiInformation) {
+        status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+        strerror = ogs_msprintf("No NsiInformation");
+        goto cleanup;
+    }
+
+    if (!NsiInformation->nrf_id) {
+        status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+        strerror = ogs_msprintf("No nrfId");
+        goto cleanup;
+    }
+
+    if (!NsiInformation->nsi_id) {
+        status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+        strerror = ogs_msprintf("No nsiId");
+        goto cleanup;
+    }
+
+    home->nrf_id = ogs_strdup(NsiInformation->nrf_id);
+    ogs_assert(home->nrf_id);
+    home->nsi_id = ogs_strdup(NsiInformation->nsi_id);
+    ogs_assert(home->nsi_id);
+
+    memset(&sendmsg, 0, sizeof(sendmsg));
+    sendmsg.AuthorizedNetworkSliceInfo = AuthorizedNetworkSliceInfo;
+

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/nssf/nnssf-handler.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nssf/nnssf-handler.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/nssf/nssf-sm.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nssf/nssf-sm.c Changed

@@ -46,6 +46,12 @@
     ogs_pool_id_t stream_id = OGS_INVALID_POOL_ID;
     ogs_sbi_request_t *request = NULL;
 
+    nssf_home_t *home = NULL;
+
+    ogs_pool_id_t sbi_object_id = OGS_INVALID_POOL_ID;
+    ogs_sbi_xact_t *sbi_xact = NULL;
+    ogs_pool_id_t sbi_xact_id = OGS_INVALID_POOL_ID;
+
     ogs_sbi_nf_instance_t *nf_instance = NULL;
     ogs_sbi_subscription_data_t *subscription_data = NULL;
     ogs_sbi_response_t *response = NULL;
@@ -141,7 +147,8 @@
             CASE(OGS_SBI_RESOURCE_NAME_NETWORK_SLICE_INFORMATION)
                 SWITCH(message.h.method)
                 CASE(OGS_SBI_HTTP_METHOD_GET)
-                    nssf_nnrf_nsselection_handle_get(stream, &message);
+                    nssf_nnrf_nsselection_handle_get_from_amf_or_vnssf(
+                            stream, &message);
                     break;
 
                 DEFAULT
@@ -191,7 +198,16 @@
             break;
         }
 
-        if (strcmp(message.h.api.version, OGS_SBI_API_V1) != 0) {
+        SWITCH(message.h.service.name)
+        CASE(OGS_SBI_SERVICE_NAME_NNSSF_NSSELECTION)
+            api_version = OGS_SBI_API_V2;
+            break;
+        DEFAULT
+            api_version = OGS_SBI_API_V1;
+        END
+
+        ogs_assert(api_version);
+        if (strcmp(message.h.api.version, api_version) != 0) {
             ogs_error("Not supported version %s", message.h.api.version);
             ogs_sbi_message_free(&message);
             ogs_sbi_response_free(response);
@@ -289,6 +305,80 @@
             END
             break;
 
+        CASE(OGS_SBI_SERVICE_NAME_NNRF_DISC)
+            SWITCH(message.h.resource.component0)
+            CASE(OGS_SBI_RESOURCE_NAME_NF_INSTANCES)
+                sbi_xact_id = OGS_POINTER_TO_UINT(e->h.sbi.data);
+                ogs_assert(sbi_xact_id >= OGS_MIN_POOL_ID &&
+                        sbi_xact_id <= OGS_MAX_POOL_ID);
+
+                sbi_xact = ogs_sbi_xact_find_by_id(sbi_xact_id);
+                if (!sbi_xact) {
+                    /* CLIENT_WAIT timer could remove SBI transaction
+                     * before receiving SBI message */
+                    ogs_error("SBI transaction has already been removed %d",
+                            sbi_xact_id);
+                    break;
+                }
+
+                SWITCH(message.h.method)
+                CASE(OGS_SBI_HTTP_METHOD_GET)
+                    if (message.res_status == OGS_SBI_HTTP_STATUS_OK)
+                        nssf_nnrf_handle_nf_discover(sbi_xact, &message);
+                    else
+                        ogs_error("HTTP response error %d",
+                                message.res_status);
+                    break;
+
+                DEFAULT
+                    ogs_error("Invalid HTTP method %s", message.h.method);
+                    ogs_assert_if_reached();
+                END
+                break;
+
+            DEFAULT
+                ogs_error("Invalid resource name %s",
+                        message.h.resource.component0);
+                ogs_assert_if_reached();
+            END
+            break;
+
+        CASE(OGS_SBI_SERVICE_NAME_NNSSF_NSSELECTION)
+            sbi_xact_id = OGS_POINTER_TO_UINT(e->h.sbi.data);
+            ogs_assert(sbi_xact_id >= OGS_MIN_POOL_ID &&
+                    sbi_xact_id <= OGS_MAX_POOL_ID);
+
+            sbi_xact = ogs_sbi_xact_find_by_id(sbi_xact_id);
+            if (!sbi_xact) {
+                /* CLIENT_WAIT timer could remove SBI transaction
+                 * before receiving SBI message */
+                ogs_error("SBI transaction has already been removed %d",
+                        sbi_xact_id);
+                break;
+            }
+
+            sbi_object_id = sbi_xact->sbi_object_id;
+            ogs_assert(sbi_object_id >= OGS_MIN_POOL_ID &&
+                    sbi_object_id <= OGS_MAX_POOL_ID);
+
+            ogs_assert(sbi_xact->assoc_stream_id >= OGS_MIN_POOL_ID &&
+                    sbi_xact->assoc_stream_id <= OGS_MAX_POOL_ID);
+            stream = ogs_sbi_stream_find_by_id(sbi_xact->assoc_stream_id);
+
+            ogs_sbi_xact_remove(sbi_xact);
+
+            home = nssf_home_find_by_id(sbi_object_id);
+            if (!home) {
+                ogs_error("Home Network Context has already been removed");
+                break;
+            }
+
+            e->h.sbi.message = &message;;
+
+            nssf_nnrf_nsselection_handle_get_from_hnssf(home, stream, &message);
+            break;
+
+
         DEFAULT
             ogs_error("Invalid API name %s", message.h.service.name);
             ogs_assert_if_reached();
@@ -346,6 +436,64 @@
                     subscription_data->id);
             break;
 
+        case OGS_TIMER_SBI_CLIENT_WAIT:
+            /*
+             * ogs_pollset_poll() receives the time of the expiration
+             * of next timer as an argument. If this timeout is
+             * in very near future (1 millisecond), and if there are
+             * multiple events that need to be processed by ogs_pollset_poll(),
+             * these could take more than 1 millisecond for processing,
+             * resulting in the timer already passed the expiration.
+             *
+             * In case that another NF is under heavy load and responds
+             * to an SBI request with some delay of a few seconds,
+             * it can happen that ogs_pollset_poll() adds SBI responses
+             * to the event list for further processing,
+             * then ogs_timer_mgr_expire() is called which will add
+             * an additional event for timer expiration. When all events are
+             * processed one-by-one, the SBI xact would get deleted twice
+             * in a row, resulting in a crash.
+             *
+             * 1. ogs_pollset_poll()
+             *    message was received and put into an event list,
+             * 2. ogs_timer_mgr_expire()
+             *    add an additional event for timer expiration
+             * 3. message event is processed. (free SBI xact)
+             * 4. timer expiration event is processed. (double-free SBI xact)
+             *
+             * To avoid double-free SBI xact,
+             * we need to check ogs_sbi_xact_find_by_id()
+             */
+            sbi_xact_id = OGS_POINTER_TO_UINT(e->h.sbi.data);
+            ogs_assert(sbi_xact_id >= OGS_MIN_POOL_ID &&
+                    sbi_xact_id <= OGS_MAX_POOL_ID);
+
+            sbi_xact = ogs_sbi_xact_find_by_id(sbi_xact_id);
+            if (!sbi_xact) {
+                ogs_error("SBI transaction has already been removed %d",
+                        sbi_xact_id);
+                break;
+            }
+
+            ogs_assert(sbi_xact->assoc_stream_id >= OGS_MIN_POOL_ID &&
+                    sbi_xact->assoc_stream_id <= OGS_MAX_POOL_ID);
+            stream = ogs_sbi_stream_find_by_id(sbi_xact->assoc_stream_id);
+
+            ogs_sbi_xact_remove(sbi_xact);
+
+            ogs_error("Cannot receive SBI message");
+
+            if (!stream) {
+                ogs_error("STREAM has alreadt been removed %d",
+                        sbi_xact->assoc_stream_id);
+                break;
+            }
+            ogs_assert(true ==
+                ogs_sbi_server_send_error(stream,
+                    OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL,
+                    "Cannot receive SBI message", NULL, NULL));
+            break;
+
         default:
             ogs_error("Unknown timer%s:%d",
                     ogs_timer_get_name(e->h.timer_id), e->h.timer_id);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/nssf/sbi-path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nssf/sbi-path.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -33,6 +33,7 @@
     ogs_sbi_nf_instance_build_default(nf_instance);
     ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SCP);
     ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AMF);
+    ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_NSSF);
 
     /* Build NF service information. It will be transmitted to NRF. */
     if (ogs_sbi_nf_service_is_available(
@@ -43,6 +44,7 @@
         ogs_sbi_nf_service_add_version(
                     service, OGS_SBI_API_V2, OGS_SBI_API_V2_0_0, NULL);
         ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF);
+        ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_NSSF);
     }
 
     /* Initialize NRF NF Instance */
@@ -64,3 +66,57 @@
     ogs_sbi_client_stop_all();
     ogs_sbi_server_stop_all();
 }
+
+bool nssf_sbi_send_request(
+        ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact)
+{
+    ogs_assert(nf_instance);
+    ogs_assert(xact);
+    return ogs_sbi_send_request_to_nf_instance(nf_instance, xact);
+}
+
+int nssf_sbi_discover_and_send(
+        ogs_sbi_service_type_e service_type,
+        ogs_sbi_discovery_option_t *discovery_option,
+        ogs_sbi_request_t *(*build)(nssf_home_t *home, void *data),
+        nssf_home_t *home, ogs_sbi_stream_t *stream, void *data)
+{
+    ogs_sbi_xact_t *xact = NULL;
+    int r;
+
+    ogs_assert(service_type);
+    ogs_assert(home);
+    ogs_assert(stream);
+    ogs_assert(build);
+
+    ogs_assert(home->id >= OGS_MIN_POOL_ID && home->id <= OGS_MAX_POOL_ID);
+
+    xact = ogs_sbi_xact_add(
+            home->id, &home->sbi, service_type, discovery_option,
+            (ogs_sbi_build_f)build, home, data);
+    if (!xact) {
+        ogs_error("nssf_sbi_discover_and_send() failed");
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream,
+                OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL,
+                "Cannot discover", NULL, NULL));
+        return OGS_ERROR;
+    }
+
+    xact->assoc_stream_id = ogs_sbi_id_from_stream(stream);
+    ogs_assert(xact->assoc_stream_id >= OGS_MIN_POOL_ID &&
+            xact->assoc_stream_id <= OGS_MAX_POOL_ID);
+
+    r = ogs_sbi_discover_and_send(xact);
+    if (r != OGS_OK) {
+        ogs_error("nssf_sbi_discover_and_send() failed");
+        ogs_sbi_xact_remove(xact);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream,
+                OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL,
+                "Cannot discover", NULL, NULL));
+        return r;
+    }
+
+    return OGS_OK;
+}

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/nssf/sbi-path.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/nssf/sbi-path.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/pcf/context.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/pcf/context.c Changed

@@ -875,36 +875,45 @@
             ogs_pool_size(&pcf_ue_sm_pool));
 }
 
-int pcf_db_qos_data(char *supi,
-        ogs_plmn_id_t *plmn_id, ogs_s_nssai_t *s_nssai, char *dnn,
-        ogs_session_data_t *session_data)
+int pcf_get_session_data(const char *supi,
+                         const ogs_plmn_id_t *plmn_id,
+                         const ogs_s_nssai_t *s_nssai,
+                         const char *dnn,
+                         ogs_session_data_t *session_data,
+                         int flags)
 {
-    int rv;
-
+    int rv = OGS_OK;
     ogs_app_policy_conf_t *policy_conf = NULL;
 
+    /* Validate input parameters */
     ogs_assert(supi);
     ogs_assert(s_nssai);
     ogs_assert(dnn);
     ogs_assert(session_data);
 
+    /* Initialize the session data structure */
     memset(session_data, 0, sizeof(*session_data));
 
+    /* Attempt to locate a policy configuration */
     policy_conf = ogs_app_policy_conf_find(supi, plmn_id);
     if (policy_conf) {
         rv = ogs_app_config_session_data(
                 supi, plmn_id, s_nssai, dnn, session_data);
-        if (rv != OGS_OK)
-            ogs_error("ogs_app_config_session_data() failed - "
-                    "MCC%d MNC%d SST%d SD0x%x DNN%s",
-                    ogs_plmn_id_mcc(plmn_id), ogs_plmn_id_mnc(plmn_id),
-                    s_nssai->sst, s_nssai->sd.v, dnn);
+        if (rv != OGS_OK) {
+            if (!(flags & PCF_SESSION_DATA_FLAG_NO_ERROR_LOG))
+                ogs_error("ogs_app_config_session_data() failed - "
+                        "MCC%d MNC%d SST%d SD0x%x DNN%s",
+                        ogs_plmn_id_mcc(plmn_id), ogs_plmn_id_mnc(plmn_id),
+                        s_nssai->sst, s_nssai->sd.v, dnn);
+        }
     } else {
         rv = ogs_dbi_session_data(supi, s_nssai, dnn, session_data);
-        if (rv != OGS_OK)
-            ogs_error("ogs_dbi_session_data() failed - "
-                    "SUPI%s SST%d SD0x%x DNN%s",
-                    supi, s_nssai->sst, s_nssai->sd.v, dnn);
+        if (rv != OGS_OK) {
+            if (!(flags & PCF_SESSION_DATA_FLAG_NO_ERROR_LOG))
+                ogs_error("ogs_dbi_session_data() failed - "
+                        "SUPI%s SST%d SD0x%x DNN%s",
+                        supi, s_nssai->sst, s_nssai->sd.v, dnn);
+        }
     }
 
     return rv;

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/pcf/context.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/pcf/context.h Changed

@@ -244,9 +244,42 @@
 pcf_app_t *pcf_app_find_by_app_session_id(char *app_session_id);
 int pcf_instance_get_load(void);
 
-int pcf_db_qos_data(char *supi,
-        ogs_plmn_id_t *plmn_id, ogs_s_nssai_t *s_nssai, char *dnn,
-        ogs_session_data_t *session_data);
+/*------------------------------------------------------------------
+ * Flag definition(s) for pcf_get_session_data().
+ *------------------------------------------------------------------
+ * Use PCF_SESSION_DATA_FLAG_NO_ERROR_LOG to suppress error logs.
+ */
+#define PCF_SESSION_DATA_FLAG_NO_ERROR_LOG 0x01
+
+/*------------------------------------------------------------------
+ * pcf_get_session_data - Retrieve session data from policy config or DB.
+ *
+ * This function retrieves session data for the given subscriber by
+ * first checking for a policy configuration; if none is found, it
+ * falls back to querying the database.
+ *
+ * Parameters:
+ *   supi         - Subscriber identifier (read-only).
+ *   plmn_id      - Pointer to a PLMN ID structure (read-only).
+ *   s_nssai      - Pointer to an S-NSSAI structure (read-only).
+ *   dnn          - Data network name (read-only).
+ *   session_data - Pointer to the session data structure to be filled.
+ *   flags        - Flags to control behavior (e.g., error logging).
+ *
+ * Returns:
+ *   OGS_OK on success, or an error code on failure.
+ *
+ * Note:
+ *   To suppress error logging, pass the flag
+ *   PCF_SESSION_DATA_FLAG_NO_ERROR_LOG in the flags parameter.
+ *------------------------------------------------------------------
+ */
+int pcf_get_session_data(const char *supi,
+                         const ogs_plmn_id_t *plmn_id,
+                         const ogs_s_nssai_t *s_nssai,
+                         const char *dnn,
+                         ogs_session_data_t *session_data,
+                         int flags);
 
 #ifdef __cplusplus
 }

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/pcf/npcf-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/pcf/npcf-handler.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/pcf/sbi-path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/pcf/sbi-path.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/scp/sbi-path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/scp/sbi-path.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/sgwu/gtp-path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/sgwu/gtp-path.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -112,8 +112,8 @@
     if (header_desc.type == OGS_GTPU_MSGTYPE_END_MARKER) {
         ogs_pfcp_object_t *pfcp_object = NULL;
         ogs_pfcp_pdr_t *pdr = NULL;
+
         ogs_gtp2_header_desc_t sendhdr;
-        ogs_pkbuf_t *sendbuf = NULL;
 
         pfcp_object = ogs_pfcp_object_find_by_teid(header_desc.teid);
         if (!pfcp_object) {
@@ -154,14 +154,19 @@
 
         ogs_assert(pdr);
 
-        sendbuf = ogs_pkbuf_copy(pkbuf);
-        ogs_assert(sendbuf);
+        /* Forward End-Marker Packet */
+        memset(&sendhdr, 0, sizeof(header_desc));
+        sendhdr.type = OGS_GTPU_MSGTYPE_END_MARKER;
+
+        ogs_gtp2_encapsulate_header(&sendhdr, pkbuf);
 
-        /* Forward packet */
-        memset(&sendhdr, 0, sizeof(sendhdr));
-        sendhdr.type = header_desc.type;
+        ogs_pfcp_send_gtpu(pdr, pkbuf);
 
-        ogs_pfcp_send_g_pdu(pdr, &sendhdr, sendbuf);
+        /*
+         * The ogs_pfcp_send_gtpu() function
+         * buffers or frees the Packet Buffer(pkbuf) memory.
+         */
+        return;
 
     } else if (header_desc.type == OGS_GTPU_MSGTYPE_ERR_IND) {
         ogs_pfcp_far_t *far = NULL;
@@ -260,7 +265,7 @@
 
         ogs_assert(pdr);
         ogs_assert(true == ogs_pfcp_up_handle_pdr(
-                    pdr, header_desc.type, &header_desc, pkbuf, &report));
+                    pdr, header_desc.type, len, &header_desc, pkbuf, &report));
 
         if (report.type.downlink_data_report) {
             ogs_assert(pdr->sess);
@@ -295,7 +300,7 @@
     ogs_pkbuf_config_t config;
     memset(&config, 0, sizeof config);
 
-    config.cluster_2048_pool = ogs_app()->pool.packet;
+    config.cluster_2048_pool = ogs_app()->pool.gtpu;
 
 #if OGS_USE_TALLOC == 1
     /* allocate a talloc pool for GTP to ensure it doesn't have to go back

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/sgwu/sxa-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/sgwu/sxa-handler.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/binding.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/binding.c Changed

@@ -21,6 +21,7 @@
 #include "s5c-build.h"
 #include "pfcp-path.h"
 #include "gtp-path.h"
+#include "sbi-path.h"
 
 #include "ipfw/ipfw2.h"
 
@@ -586,9 +587,9 @@
                 } else {
                     ogs_assert(OGS_OK ==
                         ogs_pfcp_sockaddr_to_f_teid(
-                            sess->upf_n3_addr, sess->upf_n3_addr6,
+                            sess->local_ul_addr, sess->local_ul_addr6,
                             &ul_pdr->f_teid, &ul_pdr->f_teid_len));
-                    ul_pdr->f_teid.teid = sess->upf_n3_teid;
+                    ul_pdr->f_teid.teid = sess->local_ul_teid;
                 }
 
                 qos_flow->pcc_rule.id = ogs_strdup(pcc_rule->id);
@@ -779,6 +780,9 @@
     if (ogs_list_count(&sess->qos_flow_to_modify_list)) {
         ogs_assert(OGS_OK ==
                 smf_5gc_pfcp_send_qos_flow_list_modification_request(
-                    sess, NULL, pfcp_flags, 0));
+                    sess, NULL,
+                    HOME_ROUTED_ROAMING_IN_HSMF(sess) ?
+                        OGS_PFCP_MODIFY_HOME_ROUTED_ROAMING|pfcp_flags :
+                        pfcp_flags, 0));
     }
 }

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/context.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/context.c Changed

@@ -1464,6 +1464,10 @@
     sess->sm_context_ref = ogs_msprintf("%d", sess->index);
     ogs_assert(sess->sm_context_ref);
 
+    /* Set PduSessionRef in 5GC */
+    sess->pdu_session_ref = ogs_msprintf("%d", sess->index);
+    ogs_assert(sess->pdu_session_ref);
+
     /* Create BAR in PFCP Session */
     ogs_pfcp_bar_new(&sess->pfcp);
 
@@ -1493,7 +1497,7 @@
     return sess;
 }
 
-smf_sess_t *smf_sess_add_by_sbi_message(ogs_sbi_message_t *message)
+smf_sess_t *smf_sess_add_by_sm_context(ogs_sbi_message_t *message)
 {
     smf_ue_t *smf_ue = NULL;
     smf_sess_t *sess = NULL;
@@ -1540,6 +1544,54 @@
     return sess;
 }
 
+smf_sess_t *smf_sess_add_by_pdu_session(ogs_sbi_message_t *message)
+{
+    smf_ue_t *smf_ue = NULL;
+    smf_sess_t *sess = NULL;
+
+    OpenAPI_pdu_session_create_data_t *PduSessionCreateData = NULL;
+
+    ogs_assert(message);
+    PduSessionCreateData = message->PduSessionCreateData;
+    if (!PduSessionCreateData) {
+        ogs_error("No PduSessionCreateData");
+        return NULL;
+    }
+
+    if (!PduSessionCreateData->supi) {
+        ogs_error("No SUPI");
+        return NULL;
+    }
+
+    if (PduSessionCreateData->is_pdu_session_id == false) {
+        ogs_error("PDU session identitiy is unassigned");
+        return NULL;
+    }
+
+    smf_ue = smf_ue_find_by_supi(PduSessionCreateData->supi);
+    if (!smf_ue) {
+        smf_ue = smf_ue_add_by_supi(PduSessionCreateData->supi);
+        if (!smf_ue) {
+            ogs_error("smf_ue_add_by_supi() failed");
+            return NULL;
+        }
+    }
+
+    sess = smf_sess_find_by_psi(smf_ue, PduSessionCreateData->pdu_session_id);
+    if (sess) {
+        ogs_warn("OLD Session Will Release SUPI:%s,PDU Session identity:%d",
+                PduSessionCreateData->supi,
+                PduSessionCreateData->pdu_session_id);
+        smf_metrics_inst_by_slice_add(&sess->serving_plmn_id, &sess->s_nssai,
+                SMF_METR_GAUGE_SM_SESSIONNBR, -1);
+        smf_sess_remove(sess);
+    }
+
+    sess = smf_sess_add_by_psi(smf_ue, PduSessionCreateData->pdu_session_id);
+
+    return sess;
+}
+
 uint8_t smf_sess_set_ue_ip(smf_sess_t *sess)
 {
     ogs_pfcp_subnet_t *subnet6 = NULL;
@@ -1747,12 +1799,15 @@
 
     if (sess->sm_context_ref)
         ogs_free(sess->sm_context_ref);
-
     if (sess->sm_context_status_uri)
         ogs_free(sess->sm_context_status_uri);
     if (sess->namf.client)
         ogs_sbi_client_remove(sess->namf.client);
 
+    CLEAR_PDU_SESSION(sess);
+    if (sess->pdu_session.client)
+        ogs_sbi_client_remove(sess->pdu_session.client);
+
     PCF_SM_POLICY_CLEAR(sess);
     if (sess->policy_association.client)
         ogs_sbi_client_remove(sess->policy_association.client);
@@ -1783,20 +1838,48 @@
         ogs_free(sess->session.ipv6_framed_routes);
     }
 
-    if (sess->upf_n3_addr)
-        ogs_freeaddrinfo(sess->upf_n3_addr);
-    if (sess->upf_n3_addr6)
-        ogs_freeaddrinfo(sess->upf_n3_addr6);
-
-    if (sess->handover.upf_dl_addr)
-        ogs_freeaddrinfo(sess->handover.upf_dl_addr);
-    if (sess->handover.upf_dl_addr6)
-        ogs_freeaddrinfo(sess->handover.upf_dl_addr6);
+    if (sess->handover.local_dl_addr)
+        ogs_freeaddrinfo(sess->handover.local_dl_addr);
+    if (sess->handover.local_dl_addr6)
+        ogs_freeaddrinfo(sess->handover.local_dl_addr6);
+
+    if (sess->local_dl_addr)
+        ogs_freeaddrinfo(sess->local_dl_addr);
+    if (sess->local_dl_addr6)
+        ogs_freeaddrinfo(sess->local_dl_addr6);
+    if (sess->local_ul_addr)
+        ogs_freeaddrinfo(sess->local_ul_addr);
+    if (sess->local_ul_addr6)
+        ogs_freeaddrinfo(sess->local_ul_addr6);
 
     if (sess->pcf_id)
         ogs_free(sess->pcf_id);
-    if (sess->serving_nf_id)
-        ogs_free(sess->serving_nf_id);
+    if (sess->amf_nf_id)
+        ogs_free(sess->amf_nf_id);
+
+    /* H-SMF */
+    if (sess->h_smf_uri)
+        ogs_free(sess->h_smf_uri);
+    if (sess->h_smf.client)
+        ogs_sbi_client_remove(sess->h_smf.client);
+    if (sess->vsmf_pdu_session_uri)
+        ogs_free(sess->vsmf_pdu_session_uri);
+    if (sess->v_smf.client)
+        ogs_sbi_client_remove(sess->v_smf.client);
+
+    if (sess->n1SmBufFromUe)
+        ogs_pkbuf_free(sess->n1SmBufFromUe);
+
+    OGS_NAS_CLEAR_DATA(&sess->h_smf_extended_protocol_configuration_options);
+    sess->h_smf_gsm_cause = 0;
+
+    CLEAR_QOS_FLOWS_SETUP_LIST(sess->h_smf_qos_flows_setup_list);
+    CLEAR_QOS_FLOWS_ADD_MOD_REQUEST_LIST(
+            sess->h_smf_qos_flows_add_mod_request_list);
+    CLEAR_QOS_FLOWS_REL_REQUEST_LIST(sess->h_smf_qos_flows_rel_request_list);
+
+    if (sess->pending_modification_xact)
+        ogs_sbi_xact_remove(sess->pending_modification_xact);
 
     /* Free SBI object memory */
     ogs_sbi_object_free(&sess->sbi);
@@ -1900,6 +1983,12 @@
     return smf_sess_find(atoll(sm_context_ref));
 }
 
+smf_sess_t *smf_sess_find_by_pdu_session_ref(char *pdu_session_ref)
+{
+    ogs_assert(pdu_session_ref);
+    return smf_sess_find(atoll(pdu_session_ref));
+}
+
 smf_sess_t *smf_sess_find_by_ipv4(uint32_t addr)
 {
     ogs_assert(self.ipv4_hash);
@@ -1985,7 +2074,10 @@
     ul_pdr->src_if = OGS_PFCP_INTERFACE_ACCESS;
 
     ul_pdr->src_if_type_presence = true;
-    ul_pdr->src_if_type = OGS_PFCP_3GPP_INTERFACE_TYPE_N3_3GPP_ACCESS;
+    if (HOME_ROUTED_ROAMING_IN_HSMF(sess))
+        ul_pdr->src_if_type = OGS_PFCP_3GPP_INTERFACE_TYPE_N9_FOR_ROAMING;
+    else
+        ul_pdr->src_if_type = OGS_PFCP_3GPP_INTERFACE_TYPE_N3_3GPP_ACCESS;
 
     ul_pdr->outer_header_removal_len = 1;
     if (sess->session.session_type == OGS_PDU_SESSION_TYPE_IPV4) {
@@ -2014,7 +2106,10 @@
     dl_far->dst_if = OGS_PFCP_INTERFACE_ACCESS;
 
     dl_far->dst_if_type_presence = true;
-    dl_far->dst_if_type = OGS_PFCP_3GPP_INTERFACE_TYPE_N3_3GPP_ACCESS;
+    if (HOME_ROUTED_ROAMING_IN_HSMF(sess))
+        dl_far->dst_if_type = OGS_PFCP_3GPP_INTERFACE_TYPE_N9_FOR_ROAMING;
+    else
+        dl_far->dst_if_type = OGS_PFCP_3GPP_INTERFACE_TYPE_N3_3GPP_ACCESS;
 
     ogs_pfcp_pdr_associate_far(dl_pdr, dl_far);
 
@@ -2075,6 +2170,105 @@
     return qos_flow;
 }
 
+smf_bearer_t *smf_vcn_tunnel_add(smf_sess_t *sess)
+{
+    smf_bearer_t *qos_flow = NULL;
+
+    ogs_pfcp_pdr_t *dl_pdr = NULL;
+    ogs_pfcp_pdr_t *ul_pdr = NULL;
+    ogs_pfcp_far_t *dl_far = NULL;

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/context.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/context.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -64,6 +64,61 @@
 
 int smf_ctf_config_init(smf_ctf_config_t *ctf_config);
 
+typedef struct smf_nsmf_pdusession_param_s {
+    OpenAPI_request_indication_e request_indication;
+
+    OpenAPI_cause_e cause;
+
+    struct {
+        int group;
+        int value;
+    } ngap_cause;
+
+    int gmm_cause;
+    int gsm_cause;
+
+    struct {
+    ED4(uint8_t serving_network:1;,
+        uint8_t ue_location:1;,
+        uint8_t ue_timezone:1;,
+        uint8_t spare:4;)
+    };
+
+    uint32_t dl_teid;
+    ogs_ip_t dl_ip;
+
+    OpenAPI_access_type_e an_type;
+    OpenAPI_rat_type_e rat_type;
+
+    OpenAPI_up_cnx_state_e up_cnx_state;
+
+#define QOS_RULE_CODE_FROM_PFCP_FLAGS(pfcp_flags) \
+        (pfcp_flags & OGS_PFCP_MODIFY_CREATE) ? \
+            OGS_NAS_QOS_CODE_CREATE_NEW_QOS_RULE : \
+        (pfcp_flags & OGS_PFCP_MODIFY_REMOVE) ? \
+            OGS_NAS_QOS_CODE_DELETE_EXISTING_QOS_RULE : \
+        (pfcp_flags & OGS_PFCP_MODIFY_TFT_NEW) ? \
+            OGS_NAS_QOS_CODE_CREATE_NEW_QOS_RULE : \
+        (pfcp_flags & OGS_PFCP_MODIFY_TFT_ADD) ? \
+            OGS_NAS_QOS_CODE_MODIFY_EXISTING_QOS_RULE_AND_ADD_PACKET_FILTERS : \
+        (pfcp_flags & OGS_PFCP_MODIFY_TFT_REPLACE) ? \
+            OGS_NAS_QOS_CODE_MODIFY_EXISTING_QOS_RULE_AND_REPLACE_ALL_PACKET_FILTERS : \
+        (pfcp_flags & OGS_PFCP_MODIFY_TFT_DELETE) ? \
+            OGS_NAS_QOS_CODE_MODIFY_EXISTING_QOS_RULE_AND_DELETE_PACKET_FILTERS : 0
+    uint8_t qos_rule_code;
+#define QOS_RULE_FLOW_DESCRIPTION_CODE_FROM_PFCP_FLAGS(pfcp_flags) \
+        (pfcp_flags & OGS_PFCP_MODIFY_CREATE) ? \
+            OGS_NAS_CREATE_NEW_QOS_FLOW_DESCRIPTION : \
+        (pfcp_flags & OGS_PFCP_MODIFY_REMOVE) ? \
+            OGS_NAS_DELETE_NEW_QOS_FLOW_DESCRIPTION : \
+        (pfcp_flags & OGS_PFCP_MODIFY_QOS_MODIFY) ? \
+            OGS_NAS_MODIFY_NEW_QOS_FLOW_DESCRIPTION : 0
+    uint8_t qos_flow_description_code;
+
+    uint64_t pfcp_flags;
+
+} smf_nsmf_pdusession_param_t;
+
 typedef struct smf_context_s {
     smf_ctf_config_t    ctf_config;
     const char*         diam_conf_path;   /* SMF Diameter conf path */
@@ -260,12 +315,16 @@
     uint64_t        smf_n4_seid;    /* SMF SEID is derived from NODE */
     uint64_t        upf_n4_seid;    /* UPF SEID is received from Peer */
 
-    uint32_t        upf_n3_teid;    /* UPF-N3 TEID */
-    ogs_sockaddr_t  *upf_n3_addr;   /* UPF-N3 IPv4 */
-    ogs_sockaddr_t  *upf_n3_addr6;  /* UPF-N3 IPv6 */
-
-    uint32_t        gnb_n3_teid;    /* gNB-N3 TEID */
-    ogs_ip_t        gnb_n3_ip;      /* gNB-N3 IPv4/IPv6 */
+    uint32_t        local_dl_teid;      /* Local Downlink TEID */
+    ogs_sockaddr_t  *local_dl_addr;     /* Local Downlink IPv4 */
+    ogs_sockaddr_t  *local_dl_addr6;    /* Local Downlink IPv6 */
+    uint32_t        remote_dl_teid;     /* Remote Downlink TEID */
+    ogs_ip_t        remote_dl_ip;       /* Remote Downlink IPv4/IPv6 */
+    uint32_t        local_ul_teid;      /* Local Uplink TEID */
+    ogs_sockaddr_t  *local_ul_addr;     /* Local Uplink IPv4 */
+    ogs_sockaddr_t  *local_ul_addr6;    /* Local Uplink IPv6 */
+    uint32_t        remote_ul_teid;     /* Remote Uplink TEID */
+    ogs_ip_t        remote_ul_ip;       /* Remote Uplink IPv4/IPv6 */
 
     char            *gx_sid;        /* Gx Session ID */
     char            *gy_sid;        /* Gx Session ID */
@@ -281,15 +340,48 @@
     } while(0)
     OGS_POOL(qfi_pool, uint8_t);
 
-    char            *sm_context_ref; /* smContextRef */
     uint8_t         psi; /* PDU session identity */
     uint8_t         pti; /* 5GS-NAS : Procedure transaction identity */
+    uint8_t         request_type;   /* Request type */
 
+    char            *sm_context_ref; /* smContextRef */
     char            *sm_context_status_uri; /* SmContextStatusNotification */
     struct {
         ogs_sbi_client_t *client;
     } namf;
 
+#define PDU_SESSION_IN_VSMF(__sESS)  \
+    ((__sESS) && (__sESS)->pdu_session_ref)
+#define STORE_PDU_SESSION(__sESS, __rESOURCE_URI, __rEF) \
+    do { \
+        ogs_assert(__sESS); \
+        ogs_assert(__rESOURCE_URI); \
+        ogs_assert(__rEF); \
+        CLEAR_PDU_SESSION(__sESS); \
+        (__sESS)->pdu_session_resource_uri = ogs_strdup(__rESOURCE_URI); \
+        ogs_assert((__sESS)->pdu_session_resource_uri); \
+        (__sESS)->pdu_session_ref = ogs_strdup(__rEF); \
+        ogs_assert((__sESS)->pdu_session_ref); \
+    } while(0);
+#define CLEAR_PDU_SESSION(__sESS) \
+    do { \
+        ogs_assert(__sESS); \
+        if ((__sESS)->pdu_session_ref) \
+            ogs_free((__sESS)->pdu_session_ref); \
+        (__sESS)->pdu_session_ref = NULL; \
+        if ((__sESS)->pdu_session_resource_uri) \
+            ogs_free((__sESS)->pdu_session_resource_uri); \
+        (__sESS)->pdu_session_resource_uri = NULL; \
+    } while(0);
+    char *pdu_session_ref;
+    char *pdu_session_resource_uri;
+
+    /* SMF sends the RESPONSE
+     * of POST /nsmf-pdusession/v1/pdu-sessions */
+    struct {
+        ogs_sbi_client_t *client;
+    } pdu_session;
+
     /* PCF sends the RESPONSE
      * of POST /npcf-smpolocycontrol/v1/policies */
 #define PCF_SM_POLICY_ASSOCIATED(__sESS) \
@@ -367,16 +459,88 @@
     ogs_nr_cgi_t    nr_cgi;
     ogs_time_t      ue_location_timestamp;
 
+#define HOME_ROUTED_ROAMING_IN_VSMF(__sESS) \
+    ((__sESS) && (__sESS)->h_smf_uri)
+    char            *h_smf_uri;
+    struct {
+        ogs_sbi_client_t *client;
+    } h_smf;
+
+    char            *h_smf_id;
+
+    /* Saved from H-SMF */
+    ogs_nas_extended_protocol_configuration_options_t
+        h_smf_extended_protocol_configuration_options;
+    ogs_nas_5gsm_cause_t h_smf_gsm_cause;
+
+    /* Saved from H-SMF */
+#define CLEAR_QOS_FLOWS_SETUP_LIST(__lIST) \
+    do { \
+        OpenAPI_lnode_t *node = NULL; \
+        OpenAPI_list_for_each((__lIST), node) { \
+            OpenAPI_qos_flow_setup_item_t *qosFlowSetupItem = node->data; \
+            if (qosFlowSetupItem) \
+                OpenAPI_qos_flow_setup_item_free(qosFlowSetupItem); \
+        } \
+        OpenAPI_list_free((__lIST)); \
+        (__lIST) = NULL; \
+    } while(0)
+    OpenAPI_list_t *h_smf_qos_flows_setup_list;
+#define CLEAR_QOS_FLOWS_ADD_MOD_REQUEST_LIST(__lIST) \
+    do { \
+        OpenAPI_lnode_t *node = NULL; \
+        OpenAPI_list_for_each((__lIST), node) { \
+            OpenAPI_qos_flow_add_modify_request_item_t \
+                *qosFlowAddModifyRequestItem = node->data; \
+            if (qosFlowAddModifyRequestItem) \
+                OpenAPI_qos_flow_add_modify_request_item_free( \
+                        qosFlowAddModifyRequestItem); \
+        } \
+        OpenAPI_list_free((__lIST)); \
+        (__lIST) = NULL; \
+    } while(0)
+    OpenAPI_list_t *h_smf_qos_flows_add_mod_request_list;
+#define CLEAR_QOS_FLOWS_REL_REQUEST_LIST(__lIST) \
+    do { \
+        OpenAPI_lnode_t *node = NULL; \
+        OpenAPI_list_for_each((__lIST), node) { \
+            OpenAPI_qos_flow_release_request_item_t \
+                *qosFlowReleaseRequestItem = node->data; \
+            if (qosFlowReleaseRequestItem) \
+                OpenAPI_qos_flow_release_request_item_free( \
+                        qosFlowReleaseRequestItem); \
+        } \
+        OpenAPI_list_free((__lIST)); \
+        (__lIST) = NULL; \
+    } while(0)

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/event.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/event.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/event.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/event.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/gsm-build.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/gsm-build.c Changed

@@ -26,7 +26,7 @@
 {
     ogs_pkbuf_t *pkbuf = NULL;
     smf_bearer_t *qos_flow = NULL;
-    int num_of_param, rv;
+    int rv;
 
     ogs_nas_5gs_message_t message;
     ogs_nas_5gs_pdu_session_establishment_accept_t *
@@ -51,12 +51,18 @@
     uint8_t *epco_buf = NULL;
     int16_t epco_len;
 
+    OpenAPI_list_t *qosFlowsSetupList = NULL;
+    OpenAPI_qos_flow_setup_item_t *qosFlowSetupItem = NULL;
+    OpenAPI_lnode_t *node = NULL;
+    int len;
+
     selected_pdu_session_type = &pdu_session_establishment_accept->
         selected_pdu_session_type;
     ogs_assert(selected_pdu_session_type);
     authorized_qos_rules = &pdu_session_establishment_accept->
         authorized_qos_rules;
     ogs_assert(authorized_qos_rules);
+
     session_ambr = &pdu_session_establishment_accept->session_ambr;
     ogs_assert(session_ambr);
     pdu_address = &pdu_session_establishment_accept->pdu_address;
@@ -90,55 +96,40 @@
     selected_pdu_session_type->type = sess->session.ssc_mode;
     selected_pdu_session_type->value = sess->session.session_type;
 
-    /*
-     * TS23.501
-     * 5.7.1.3 QoS Rules
-     *
-     * A default QoS rule is required to be sent to the UE for every PDU
-     * Session establishment and it is associated with a QoS Flow. For IP type
-     * PDU Session or Ethernet type PDU Session, the default QoS rule is
-     * the only QoS rule of a PDU Session which may contain a Packet Filter
-     * Set that allows all UL packets, and in this case, the highest
-     * precedence value shall be used for the QoS rule.
-     *
-     * As long as the default QoS rule does not contain a Packet Filter Set or
-     * contains a Packet Filter Set that allows all UL packets, Reflective QoS
-     * should not be applied for the QoS Flow which the default QoS rule is
-     * associated with and the RQA should not be sent for this QoS Flow.
-     */
-    memset(qos_rule, 0, sizeof(qos_rule));
-    qos_rule0.identifier = qos_flow->qfi; /* Use QFI in Open5GS */
-    qos_rule0.code = OGS_NAS_QOS_CODE_CREATE_NEW_QOS_RULE;
-    qos_rule0.DQR_bit = 1;
-    qos_rule0.num_of_packet_filter = 1;
-
-    qos_rule0.pf0.direction = OGS_NAS_QOS_DIRECTION_BIDIRECTIONAL;
-    qos_rule0.pf0.identifier = 1;
-    qos_rule0.pf0.content.length = 1;
-    qos_rule0.pf0.content.num_of_component = 1;
-    qos_rule0.pf0.content.component0.type = OGS_PACKET_FILTER_MATCH_ALL;
+    if (HOME_ROUTED_ROAMING_IN_VSMF(sess)) {
+        qosFlowsSetupList = sess->h_smf_qos_flows_setup_list;
+        ogs_assert(qosFlowsSetupList);
+
+        node = qosFlowsSetupList->first;
+        ogs_assert(node);
+        qosFlowSetupItem = node->data;
+        ogs_assert(qosFlowSetupItem);
+
+        len = ogs_base64_decode_len(qosFlowSetupItem->qos_rules);
+        ogs_assert(len);
+        authorized_qos_rules->buffer = ogs_calloc(1, len);
+        ogs_assert(authorized_qos_rules->buffer);
+        authorized_qos_rules->length =
+            ogs_base64_decode_binary(
+                    authorized_qos_rules->buffer, qosFlowSetupItem->qos_rules);
+        ogs_assert(authorized_qos_rules->length);
+
+    } else if (HOME_ROUTED_ROAMING_IN_HSMF(sess)) {
+        ogs_fatal("This should not be invoked from H-SMF during HR-Roaming");
+        ogs_assert_if_reached();
+    } else {
+        memset(qos_rule, 0, sizeof(qos_rule));
+        gsm_encode_default_qos_rule(&qos_rule0, qos_flow);
 
-    /*
-     * TS23.501
-     * 5.7.1.9 Precedence Value
-     *
-     * The QoS rule precedence value and the PDR precedence value determine
-     * the order in which a QoS rule or a PDR, respectively, shall be evaluated.
-     * The evaluation of the QoS rules or PDRs is performed in increasing order
-     * of their precedence value.
-     */
-    qos_rule0.precedence = 255; /* lowest precedence */
-    qos_rule0.flow.segregation = 0;
-    qos_rule0.flow.identifier = qos_flow->qfi;
-
-    rv = ogs_nas_build_qos_rules(authorized_qos_rules, qos_rule, 1);
-    if (rv != OGS_OK) {
-        ogs_error("ogs_nas_build_qos_rules() failed");
-        goto cleanup;
-    }
-    if (!authorized_qos_rules->length) {
-        ogs_error("No length");
-        goto cleanup;
+        rv = ogs_nas_build_qos_rules(authorized_qos_rules, qos_rule, 1);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_nas_build_qos_rules() failed");
+            goto cleanup;
+        }
+        if (!authorized_qos_rules->length) {
+            ogs_error("No length");
+            goto cleanup;
+        }
     }
 
     /* Session-AMBR */
@@ -171,15 +162,27 @@
     }
 
     /* GSM cause */
-    if (sess->ue_session_type == OGS_PDU_SESSION_TYPE_IPV4V6) {
-        if (pdu_address->pdn_type == OGS_PDU_SESSION_TYPE_IPV4) {
+    if (HOME_ROUTED_ROAMING_IN_VSMF(sess)) {
+        if (sess->h_smf_gsm_cause) {
             pdu_session_establishment_accept->presencemask |=
                 OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_5GSM_CAUSE_PRESENT;
-            *gsm_cause = OGS_5GSM_CAUSE_PDU_SESSION_TYPE_IPV4_ONLY_ALLOWED;
-        } else if (pdu_address->pdn_type == OGS_PDU_SESSION_TYPE_IPV6) {
-            pdu_session_establishment_accept->presencemask |=
-                OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_5GSM_CAUSE_PRESENT;
-            *gsm_cause = OGS_5GSM_CAUSE_PDU_SESSION_TYPE_IPV6_ONLY_ALLOWED;
+            *gsm_cause =  sess->h_smf_gsm_cause;
+        }
+        sess->h_smf_gsm_cause = 0; /* Clear GSM Cause */
+    } else if (HOME_ROUTED_ROAMING_IN_HSMF(sess)) {
+        ogs_fatal("This should not be invoked from H-SMF during HR-Roaming");
+        ogs_assert_if_reached();
+    } else {
+        if (sess->ue_session_type == OGS_PDU_SESSION_TYPE_IPV4V6) {
+            if (pdu_address->pdn_type == OGS_PDU_SESSION_TYPE_IPV4) {
+                pdu_session_establishment_accept->presencemask |=
+                    OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_5GSM_CAUSE_PRESENT;
+                *gsm_cause = OGS_5GSM_CAUSE_PDU_SESSION_TYPE_IPV4_ONLY_ALLOWED;
+            } else if (pdu_address->pdn_type == OGS_PDU_SESSION_TYPE_IPV6) {
+                pdu_session_establishment_accept->presencemask |=
+                    OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_5GSM_CAUSE_PRESENT;
+                *gsm_cause = OGS_5GSM_CAUSE_PDU_SESSION_TYPE_IPV6_ONLY_ALLOWED;
+            }
         }
     }
 
@@ -190,51 +193,75 @@
         (sess->mapped_hplmn_presence) ? &sess->mapped_hplmn : NULL);
 
     /* QoS flow descriptions */
-    memset(&qos_flow_description, 0, sizeof(qos_flow_description));
-    qos_flow_description0.identifier = qos_flow->qfi;
-    qos_flow_description0.code = OGS_NAS_CREATE_NEW_QOS_FLOW_DESCRIPTION;
-    qos_flow_description0.E_bit = 1;
-
-    num_of_param = 0;
+    if (HOME_ROUTED_ROAMING_IN_VSMF(sess)) {
+        ogs_assert(qosFlowSetupItem);
 
-    qos_flow_description0.paramnum_of_param.identifier =
-        OGS_NAX_QOS_FLOW_PARAMETER_ID_5QI;
-    qos_flow_description0.paramnum_of_param.len =
-        sizeof(qos_flow_description0.paramnum_of_param.qos_index);
-    qos_flow_description0.paramnum_of_param.qos_index = qos_flow->qos.index;
-    num_of_param++;
+        if (qosFlowSetupItem->qos_flow_description) {
+            len = ogs_base64_decode_len(qosFlowSetupItem->qos_flow_description);
+            ogs_assert(len);
+            authorized_qos_flow_descriptions->buffer = ogs_calloc(1, len);
+            ogs_assert(authorized_qos_flow_descriptions->buffer);
+            authorized_qos_flow_descriptions->length =
+                ogs_base64_decode_binary(
+                        authorized_qos_flow_descriptions->buffer,
+                        qosFlowSetupItem->qos_flow_description);
+            ogs_assert(authorized_qos_flow_descriptions->length);
 
-    qos_flow_description0.num_of_parameter = num_of_param;
+            pdu_session_establishment_accept->presencemask |=
+                OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_AUTHORIZED_QOS_FLOW_DESCRIPTIONS_PRESENT;
+        }
+    } else if (HOME_ROUTED_ROAMING_IN_HSMF(sess)) {
+        ogs_fatal("This should not be invoked from H-SMF during HR-Roaming");
+        ogs_assert_if_reached();
+    } else {
+        memset(&qos_flow_description, 0, sizeof(qos_flow_description));
+        gsm_encode_default_qos_flow_description(
+                &qos_flow_description0, qos_flow);
 
-    pdu_session_establishment_accept->presencemask |=
-        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);
-    if (rv != OGS_OK) {
-        ogs_error("ogs_nas_build_qos_flow_descriptions() failed");

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/gsm-build.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/gsm-build.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/gsm-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/gsm-handler.c Changed

@@ -47,10 +47,34 @@
     ogs_assert(pdu_session_type);
     ssc_mode = &pdu_session_establishment_request->ssc_mode;
 
-    sess->integrity_protection.mbr_dl =
-            integrity_protection_maximum_data_rate->dl;
-    sess->integrity_protection.mbr_ul =
-            integrity_protection_maximum_data_rate->ul;
+    switch (integrity_protection_maximum_data_rate->dl) {
+    case OGS_NAS_INTEGRITY_PROTECTION_MAXIMUM_DATA_RATE_64KBPS:
+        sess->integrity_protection.mbr_dl =
+            OpenAPI_max_integrity_protected_data_rate__64_KBPS;
+        break;
+    case OGS_NAS_INTEGRITY_PROTECTION_MAXIMUM_DATA_RATE_FULL:
+        sess->integrity_protection.mbr_dl =
+            OGS_NAS_INTEGRITY_PROTECTION_MAXIMUM_DATA_RATE_FULL;
+        break;
+    default:
+        sess->integrity_protection.mbr_dl =
+            OGS_NAS_INTEGRITY_PROTECTION_MAXIMUM_DATA_RATE_NULL;
+        break;
+    }
+    switch (integrity_protection_maximum_data_rate->ul) {
+    case OGS_NAS_INTEGRITY_PROTECTION_MAXIMUM_DATA_RATE_64KBPS:
+        sess->integrity_protection.mbr_ul =
+            OpenAPI_max_integrity_protected_data_rate__64_KBPS;
+        break;
+    case OGS_NAS_INTEGRITY_PROTECTION_MAXIMUM_DATA_RATE_FULL:
+        sess->integrity_protection.mbr_ul =
+            OGS_NAS_INTEGRITY_PROTECTION_MAXIMUM_DATA_RATE_FULL;
+        break;
+    default:
+        sess->integrity_protection.mbr_ul =
+            OGS_NAS_INTEGRITY_PROTECTION_MAXIMUM_DATA_RATE_NULL;
+        break;
+    }
 
     if (pdu_session_establishment_request->presencemask &
         OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST_PDU_SESSION_TYPE_PRESENT)
@@ -187,22 +211,250 @@
         }                                               \
     } while(0);
 
-int gsm_handle_pdu_session_modification_request(
-        smf_sess_t *sess, ogs_sbi_stream_t *stream,
-        ogs_nas_5gs_pdu_session_modification_request_t *
-            pdu_session_modification_request)
+int gsm_handle_pdu_session_modification_qos_rules(
+        smf_sess_t *sess,
+        ogs_nas_qos_rules_t *requested_qos_rules,
+        uint64_t *pfcp_flags)
 {
-    int i, j;
+    smf_ue_t *smf_ue = NULL;
+    int i, j, num_of_rule = 0;
 
-    uint64_t pfcp_flags = 0;
+    ogs_nas_qos_rule_t qos_ruleOGS_NAS_MAX_NUM_OF_QOS_RULE;
 
-    smf_bearer_t *qos_flow = NULL;
-    smf_pf_t *pf = NULL;
+    ogs_assert(requested_qos_rules);
+    ogs_assert(pfcp_flags);
+
+    ogs_assert(sess);
+    smf_ue = smf_ue_find_by_id(sess->smf_ue_id);
+    ogs_assert(smf_ue);
+
+    num_of_rule = ogs_nas_parse_qos_rules(qos_rule, requested_qos_rules);
+    if (!num_of_rule) {
+        ogs_error("%s:%d Invalid modification request",
+                smf_ue->supi, sess->psi);
+        return OGS_ERROR;
+    }
+
+    for (i = 0; i < num_of_rule; i++) {
+        smf_pf_t *pf = NULL;
+        smf_bearer_t *qos_flow =
+            smf_qos_flow_find_by_qfi(sess, qos_rulei.identifier);
+        if (!qos_flow) {
+            ogs_error("No Qos Flow");
+            continue;
+        }
+
+        ogs_list_init(&qos_flow->pf_to_add_list);
+
+        if (qos_rulei.code == OGS_NAS_QOS_CODE_DELETE_EXISTING_QOS_RULE) {
+            smf_pf_remove_all(qos_flow);
+
+            *pfcp_flags |= OGS_PFCP_MODIFY_REMOVE;
+            qos_flow_find_or_add(&sess->qos_flow_to_modify_list,
+                                    qos_flow, to_modify_node);
+        } else if (qos_rulei.code ==
+            OGS_NAS_QOS_CODE_CREATE_NEW_QOS_RULE ||
+                    qos_rulei.code ==
+            OGS_NAS_QOS_CODE_MODIFY_EXISTING_QOS_RULE_AND_ADD_PACKET_FILTERS ||
+                    qos_rulei.code ==
+            OGS_NAS_QOS_CODE_MODIFY_EXISTING_QOS_RULE_AND_REPLACE_ALL_PACKET_FILTERS) {
+
+            if (qos_rulei.code == OGS_NAS_QOS_CODE_CREATE_NEW_QOS_RULE ||
+                qos_rulei.code == OGS_NAS_QOS_CODE_MODIFY_EXISTING_QOS_RULE_AND_REPLACE_ALL_PACKET_FILTERS)
+                smf_pf_remove_all(qos_flow);
+
+            for (j = 0; j < qos_rulei.num_of_packet_filter &&
+                        j < OGS_MAX_NUM_OF_FLOW_IN_NAS; j++) {
+
+                pf = smf_pf_add(qos_flow);
+                ogs_assert(pf);
+
+                ogs_assert(
+                    reconfigure_packet_filter(pf, &qos_rulei, i) > 0);
+/*
+ * Refer to lib/ipfw/ogs-ipfw.h
+ * Issue #338
+ *
+ * <DOWNLINK/BI-DIRECTIONAL>
+ * TFT : Local <UE_IP> <UE_PORT> REMOTE <P-CSCF_RTP_IP> <P-CSCF_RTP_PORT>
+ * -->
+ * RULE : Source <P-CSCF_RTP_IP> <P-CSCF_RTP_PORT> Destination <UE_IP> <UE_PORT>
+ *
+ * <UPLINK>
+ * TFT : Local <UE_IP> <UE_PORT> REMOTE <P-CSCF_RTP_IP> <P-CSCF_RTP_PORT>
+ * -->
+ * RULE : Source <UE_IP> <UE_PORT> Destination <P-CSCF_RTP_IP> <P-CSCF_RTP_PORT>
+ */
+                if (pf->direction == OGS_FLOW_DOWNLINK_ONLY)
+                    ogs_ipfw_rule_swap(&pf->ipfw_rule);
+
+                if (pf->flow_description)
+                    ogs_free(pf->flow_description);
+
+/*
+ * Issue #338
+ *
+ * <DOWNLINK/BI-DIRECTIONAL>
+ * RULE : Source <P-CSCF_RTP_IP> <P-CSCF_RTP_PORT> Destination <UE_IP> <UE_PORT>
+ * -->
+ * GX : permit out from <P-CSCF_RTP_IP> <P-CSCF_RTP_PORT> to <UE_IP> <UE_PORT>
+ * PFCP : permit out from <P-CSCF_RTP_IP> <P-CSCF_RTP_PORT> to <UE_IP> <UE_PORT>
+ *
+ * <UPLINK>
+ * RULE : Source <UE_IP> <UE_PORT> Destination <P-CSCF_RTP_IP> <P-CSCF_RTP_PORT>
+ * -->
+ * GX : permit out from <P-CSCF_RTP_IP> <P-CSCF_RTP_PORT> to <UE_IP> <UE_PORT>
+ * PFCP : permit out from <P-CSCF_RTP_IP> <P-CSCF_RTP_PORT> to <UE_IP> <UE_PORT>
+ */
+                if (pf->direction == OGS_FLOW_UPLINK_ONLY) {
+                    ogs_ipfw_rule_t tmp;
+                    ogs_ipfw_copy_and_swap(&tmp, &pf->ipfw_rule);
+                    pf->flow_description =
+                        ogs_ipfw_encode_flow_description(&tmp);
+                    ogs_assert(pf->flow_description);
+                } else {
+                    pf->flow_description =
+                        ogs_ipfw_encode_flow_description(&pf->ipfw_rule);
+                    ogs_assert(pf->flow_description);
+                }
+
+                if (qos_rulei.code ==
+                        OGS_NAS_QOS_CODE_CREATE_NEW_QOS_RULE) {
+                    *pfcp_flags |= OGS_PFCP_MODIFY_TFT_NEW;
+                } else if (qos_rulei.code ==
+                        OGS_NAS_QOS_CODE_MODIFY_EXISTING_QOS_RULE_AND_ADD_PACKET_FILTERS) {
+                    *pfcp_flags |= OGS_PFCP_MODIFY_TFT_ADD;
+                } else if (qos_rulei.code ==
+                        OGS_NAS_QOS_CODE_MODIFY_EXISTING_QOS_RULE_AND_REPLACE_ALL_PACKET_FILTERS) {
+                    *pfcp_flags |= OGS_PFCP_MODIFY_TFT_REPLACE;
+                } else
+                    ogs_assert_if_reached();
+
+                qos_flow_find_or_add(&sess->qos_flow_to_modify_list,
+                                        qos_flow, to_modify_node);
+
+                ogs_list_add(
+                        &qos_flow->pf_to_add_list, &pf->to_add_node);
+            }
+        } else if (qos_rulei.code ==
+            OGS_NAS_QOS_CODE_MODIFY_EXISTING_QOS_RULE_AND_DELETE_PACKET_FILTERS) {
+
+            qos_flow->num_of_pf_to_delete = 0;
+            for (j = 0; j < qos_rulei.num_of_packet_filter &&
+                        j < OGS_MAX_NUM_OF_FLOW_IN_NAS; j++) {
+
+                pf = smf_pf_find_by_identifier(
+                        qos_flow, qos_rulei.pfj.identifier);
+                if (pf) {
+                    qos_flow->pf_to_delete
+                        qos_flow->num_of_pf_to_delete++ =
+                            qos_rulei.pfj.identifier;
+                    smf_pf_remove(pf);
+                }
+            }
+
+            if (ogs_list_count(&qos_flow->pf_list)) {
+                *pfcp_flags |= OGS_PFCP_MODIFY_TFT_DELETE;
+                qos_flow_find_or_add(&sess->qos_flow_to_modify_list,
+                                        qos_flow, to_modify_node);
+            } else {
+                *pfcp_flags |= OGS_PFCP_MODIFY_REMOVE;
+                qos_flow_find_or_add(&sess->qos_flow_to_modify_list,

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/gsm-handler.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/gsm-handler.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/gsm-sm.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/gsm-sm.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -35,6 +35,7 @@
 #include "pfcp-path.h"
 #include "ngap-path.h"
 #include "fd-path.h"
+#include "local-path.h"
 
 static uint8_t gtp_cause_from_diameter(uint8_t gtp_version,
         const uint32_t dia_err, const uint32_t *dia_exp_err)
@@ -257,6 +258,8 @@
     case OGS_EVENT_SBI_SERVER:
         sbi_message = e->h.sbi.message;
         ogs_assert(sbi_message);
+        smf_ue = smf_ue_find_by_id(sess->smf_ue_id);
+        ogs_assert(smf_ue);
 
         stream_id = OGS_POINTER_TO_UINT(e->h.sbi.data);
         ogs_assert(stream_id >= OGS_MIN_POOL_ID &&
@@ -270,24 +273,70 @@
 
         SWITCH(sbi_message->h.service.name)
         CASE(OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION)
-            SWITCH(sbi_message->h.resource.component2)
-            CASE(OGS_SBI_RESOURCE_NAME_MODIFY)
-            CASE(OGS_SBI_RESOURCE_NAME_RELEASE)
+            SWITCH(sbi_message->h.resource.component0)
+            CASE(OGS_SBI_RESOURCE_NAME_SM_CONTEXTS)
+                SWITCH(sbi_message->h.resource.component2)
+                CASE(OGS_SBI_RESOURCE_NAME_MODIFY)
+                CASE(OGS_SBI_RESOURCE_NAME_RELEASE)
+                    ogs_error("Invalid resource name %s",
+                                sbi_message->h.resource.component2);
+                    ogs_assert(true ==
+                        ogs_sbi_server_send_error(stream,
+                            OGS_SBI_HTTP_STATUS_BAD_REQUEST, sbi_message,
+                            "Invalid resource name %s",
+                            sbi_message->h.resource.component2, NULL));
+                    OGS_FSM_TRAN(s, smf_gsm_state_exception);
+                    break;
+                DEFAULT
+                    if (smf_nsmf_handle_create_sm_context(
+                            sess, stream, sbi_message) == false) {
+                        ogs_error("smf_nsmf_handle_create_sm_context() failed");
+                        OGS_FSM_TRAN(s, smf_gsm_state_exception);
+                        break;
+                    }
+
+                    if (HOME_ROUTED_ROAMING_IN_VSMF(sess)) {
+                        ogs_info("%s:%d SMContextCreate HR Roaming in V-SMF",
+                                smf_ue->supi, sess->psi);
+                        OGS_FSM_TRAN(s, smf_gsm_state_wait_pfcp_establishment);
+                    }
+                END
+                break;
+            CASE(OGS_SBI_RESOURCE_NAME_PDU_SESSIONS)
+                SWITCH(sbi_message->h.resource.component2)
+                CASE(OGS_SBI_RESOURCE_NAME_MODIFY)
+                CASE(OGS_SBI_RESOURCE_NAME_RELEASE)
+                    ogs_error("Invalid resource name %s",
+                                sbi_message->h.resource.component2);
+                    ogs_assert(true ==
+                        ogs_sbi_server_send_error(stream,
+                            OGS_SBI_HTTP_STATUS_BAD_REQUEST, sbi_message,
+                            "Invalid resource name %s",
+                            sbi_message->h.resource.component2, NULL));
+                    OGS_FSM_TRAN(s, smf_gsm_state_exception);
+                    break;
+                DEFAULT
+                    if (smf_nsmf_handle_create_data_in_hsmf(
+                            sess, stream, sbi_message) == false) {
+                        ogs_error(
+                                "smf_nsmf_handle_create_pdu_session_in_hsmf() "
+                                "failed");
+                        OGS_FSM_TRAN(s, smf_gsm_state_exception);
+                        break;
+                    }
+                    OGS_FSM_TRAN(s,
+                            smf_gsm_state_wait_5gc_sm_policy_association);
+                END
+                break;
+
+            DEFAULT
                 ogs_error("Invalid resource name %s",
-                            sbi_message->h.resource.component2);
+                        sbi_message->h.resource.component0);
                 ogs_assert(true ==
                     ogs_sbi_server_send_error(stream,
                         OGS_SBI_HTTP_STATUS_BAD_REQUEST, sbi_message,
-                        "Invalid resource name %s",
-                        sbi_message->h.resource.component2, NULL));
-                OGS_FSM_TRAN(s, smf_gsm_state_exception);
-                break;
-            DEFAULT
-                if (smf_nsmf_handle_create_sm_context(
-                        sess, stream, sbi_message) == false) {
-                    ogs_error("smf_nsmf_handle_create_sm_context() failed");
-                    OGS_FSM_TRAN(s, smf_gsm_state_exception);
-                }
+                        "Invalid resource name",
+                        sbi_message->h.resource.component0, NULL));
             END
             break;
 
@@ -485,8 +534,6 @@
     ogs_pool_id_t stream_id = OGS_INVALID_POOL_ID;
     ogs_sbi_message_t *sbi_message = NULL;
 
-    int state = 0;
-
     ogs_assert(s);
     ogs_assert(e);
 
@@ -591,6 +638,11 @@
 
         CASE(OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL)
             /*
+             * TS23.502
+             * 4.3.2.2 UE Requested PDU Session Establishment
+             *
+             * 4.3.2.2.1 Non-roaming and Roaming with Local Breakout
+             *
              * By here, SMF has already sent a response to AMF in
              * smf_nudm_sdm_handle_get. Therefore, 'stream = e->h.sbi.data'
              * should not be used here. Instead of sending additional error
@@ -598,16 +650,22 @@
              * Namf_Communication_N1N2MessageTransfer request by transitioning
              * into smf_gsm_state_5gc_n1_n2_reject. This is according to
              *
-             * TS23.502
-             * 6.3.1.7 4.3.2.2 UE Requested PDU Session Establishment
-             * p100
              * 11.  ...
              * If the PDU session establishment failed anywhere between step 5
              * and step 11, then the Namf_Communication_N1N2MessageTransfer
              * request shall include the N1 SM container with a PDU Session
              * Establishment Reject message ...
+             *
+             * 4.3.2.2.2 Home-routed Roaming
+             * However, Home Routed Roaming requires a stream.
+             * This is because we need the stream
+             * when we send the Nsmf_PDUSession_Create Response in step 13.
+             *
+             * 13. H-SMF to V-SMF: Nsmf_PDUSession_Create Response ...
              */
-            state = e->h.sbi.state;
+            stream_id = OGS_POINTER_TO_UINT(e->h.sbi.data);
+            if (stream_id >= OGS_MIN_POOL_ID && stream_id <= OGS_MAX_POOL_ID)
+                stream = ogs_sbi_stream_find_by_id(stream_id);
 
             SWITCH(sbi_message->h.resource.component0)
             CASE(OGS_SBI_RESOURCE_NAME_SM_POLICIES)
@@ -623,7 +681,7 @@
                             sbi_message->res_status);
                     OGS_FSM_TRAN(s, smf_gsm_state_5gc_n1_n2_reject);
                 } else if (smf_npcf_smpolicycontrol_handle_create(
-                        sess, state, sbi_message) == true) {
+                        sess, stream, sbi_message) == true) {
                     OGS_FSM_TRAN(s,
                         &smf_gsm_state_wait_pfcp_establishment);
                 } else {
@@ -665,6 +723,8 @@
     ogs_pfcp_message_t *pfcp_message = NULL;
     int rv;
 
+    ogs_sbi_stream_t *stream = NULL;
+
     ogs_assert(s);
     ogs_assert(e);
 
@@ -683,6 +743,10 @@
         pfcp_message = e->pfcp_message;
         ogs_assert(pfcp_message);
 
+        if (pfcp_xact->assoc_stream_id >= OGS_MIN_POOL_ID &&
+                pfcp_xact->assoc_stream_id <= OGS_MAX_POOL_ID)
+            stream = ogs_sbi_stream_find_by_id(pfcp_xact->assoc_stream_id);
+
         switch (pfcp_message->h.type) {
         case OGS_PFCP_SESSION_ESTABLISHMENT_RESPONSE_TYPE:
             if (pfcp_xact->epc) {
@@ -737,6 +801,7 @@
                 }
                 smf_bearer_binding(sess);
             } else {
+                int r = 0;
                 pfcp_cause = smf_5gc_n4_handle_session_establishment_response(
                         sess, pfcp_xact,
                         &pfcp_message->pfcp_session_establishment_response);
@@ -744,21 +809,41 @@
                     OGS_FSM_TRAN(s, smf_gsm_state_5gc_n1_n2_reject);
                     return;
                 }
-                memset(&param, 0, sizeof(param));
-                param.state = SMF_UE_REQUESTED_PDU_SESSION_ESTABLISHMENT;

open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/gsmue-message.c Added

@@ -0,0 +1,1644 @@
+/*
+ * Copyright (C) 2024 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 "gsmue-message.h"
+
+#undef OGS_LOG_DOMAIN
+#define OGS_LOG_DOMAIN __gsm_log_domain
+
+static int encode_pdu_session_establishment_request(
+        ogs_pkbuf_t *pkbuf, ogs_nas_5gs_message_t *message)
+{
+    ogs_nas_5gs_pdu_session_establishment_request_t
+        *pdu_session_establishment_request = NULL;
+    int encoded = 0;
+    int size = 0;
+
+    ogs_assert(message);
+    pdu_session_establishment_request =
+        &message->gsm.pdu_session_establishment_request;
+
+    if (pdu_session_establishment_request->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST_PDU_SESSION_TYPE_PRESENT) {
+        size = ogs_nas_5gs_encode_pdu_session_type(pkbuf, &pdu_session_establishment_request->pdu_session_type);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    if (pdu_session_establishment_request->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST_SSC_MODE_PRESENT) {
+        size = ogs_nas_5gs_encode_ssc_mode(pkbuf, &pdu_session_establishment_request->ssc_mode);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    if (pdu_session_establishment_request->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST_MAXIMUM_NUMBER_OF_SUPPORTED_PACKET_FILTERS_PRESENT) {
+        size = ogs_nas_5gs_encode_optional_type(pkbuf, OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST_MAXIMUM_NUMBER_OF_SUPPORTED_PACKET_FILTERS_TYPE);
+        ogs_assert(size >= 0);
+        encoded += size;
+
+        size = ogs_nas_5gs_encode_maximum_number_of_supported_packet_filters(pkbuf, &pdu_session_establishment_request->maximum_number_of_supported_packet_filters);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    if (pdu_session_establishment_request->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST_SM_PDU_DN_REQUEST_CONTAINER_PRESENT) {
+        size = ogs_nas_5gs_encode_optional_type(pkbuf, OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST_SM_PDU_DN_REQUEST_CONTAINER_TYPE);
+        ogs_assert(size >= 0);
+        encoded += size;
+
+        size = ogs_nas_5gs_encode_sm_pdu_dn_request_container(pkbuf, &pdu_session_establishment_request->sm_pdu_dn_request_container);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    if (pdu_session_establishment_request->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST_EXTENDED_PROTOCOL_CONFIGURATION_OPTIONS_PRESENT) {
+        size = ogs_nas_5gs_encode_optional_type(pkbuf, OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST_EXTENDED_PROTOCOL_CONFIGURATION_OPTIONS_TYPE);
+        ogs_assert(size >= 0);
+        encoded += size;
+
+        size = ogs_nas_5gs_encode_extended_protocol_configuration_options(pkbuf, &pdu_session_establishment_request->extended_protocol_configuration_options);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    if (pdu_session_establishment_request->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST_5GSM_CAPABILITY_PRESENT) {
+        size = ogs_nas_5gs_encode_optional_type(pkbuf, OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST_5GSM_CAPABILITY_TYPE);
+        ogs_assert(size >= 0);
+        encoded += size;
+
+        size = ogs_nas_5gs_encode_5gsm_capability(pkbuf, &pdu_session_establishment_request->gsm_capability);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    return encoded;
+}
+
+static int encode_pdu_session_establishment_accept(
+        ogs_pkbuf_t *pkbuf, ogs_nas_5gs_message_t *message)
+{
+    ogs_nas_5gs_pdu_session_establishment_accept_t
+        *pdu_session_establishment_accept = NULL;
+    int encoded = 0;
+    int size = 0;
+
+    ogs_assert(message);
+    pdu_session_establishment_accept =
+        &message->gsm.pdu_session_establishment_accept;
+
+    if (pdu_session_establishment_accept->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_RQ_TIMER_VALUE_PRESENT) {
+        size = ogs_nas_5gs_encode_optional_type(pkbuf, OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_RQ_TIMER_VALUE_TYPE);
+        ogs_assert(size >= 0);
+        encoded += size;
+
+        size = ogs_nas_5gs_encode_gprs_timer(pkbuf, &pdu_session_establishment_accept->rq_timer_value);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    if (pdu_session_establishment_accept->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_EAP_MESSAGE_PRESENT) {
+        size = ogs_nas_5gs_encode_optional_type(pkbuf, OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_EAP_MESSAGE_TYPE);
+        ogs_assert(size >= 0);
+        encoded += size;
+
+        size = ogs_nas_5gs_encode_eap_message(pkbuf, &pdu_session_establishment_accept->eap_message);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    if (pdu_session_establishment_accept->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_EXTENDED_PROTOCOL_CONFIGURATION_OPTIONS_PRESENT) {
+        size = ogs_nas_5gs_encode_optional_type(pkbuf, OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_EXTENDED_PROTOCOL_CONFIGURATION_OPTIONS_TYPE);
+        ogs_assert(size >= 0);
+        encoded += size;
+
+        size = ogs_nas_5gs_encode_extended_protocol_configuration_options(pkbuf, &pdu_session_establishment_accept->extended_protocol_configuration_options);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    if (pdu_session_establishment_accept->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_5GSM_CAUSE_PRESENT) {
+        size = ogs_nas_5gs_encode_optional_type(pkbuf, OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_5GSM_CAUSE_TYPE);
+        ogs_assert(size >= 0);
+        encoded += size;
+
+        size = ogs_nas_5gs_encode_5gsm_cause(pkbuf, &pdu_session_establishment_accept->gsm_cause);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    if (pdu_session_establishment_accept->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_MAPPED_EPS_BEARER_CONTEXTS_PRESENT) {
+        size = ogs_nas_5gs_encode_optional_type(pkbuf, OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_MAPPED_EPS_BEARER_CONTEXTS_TYPE);
+        ogs_assert(size >= 0);
+        encoded += size;
+
+        size = ogs_nas_5gs_encode_mapped_eps_bearer_contexts(pkbuf, &pdu_session_establishment_accept->mapped_eps_bearer_contexts);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    if (pdu_session_establishment_accept->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_ATSSS_CONTAINER_PRESENT) {
+        size = ogs_nas_5gs_encode_optional_type(pkbuf, OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_ATSSS_CONTAINER_TYPE);
+        ogs_assert(size >= 0);
+        encoded += size;
+
+        size = ogs_nas_5gs_encode_atsss_container(pkbuf, &pdu_session_establishment_accept->atsss_container);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    return encoded;
+}
+
+static int encode_pdu_session_establishment_reject(
+        ogs_pkbuf_t *pkbuf, ogs_nas_5gs_message_t *message)
+{
+    ogs_nas_5gs_pdu_session_establishment_reject_t
+        *pdu_session_establishment_reject = NULL;
+    int encoded = 0;
+    int size = 0;
+
+    ogs_assert(message);
+    pdu_session_establishment_reject =
+        &message->gsm.pdu_session_establishment_reject;
+
+    if (pdu_session_establishment_reject->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REJECT_EAP_MESSAGE_PRESENT) {
+        size = ogs_nas_5gs_encode_optional_type(pkbuf, OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REJECT_EAP_MESSAGE_TYPE);
+        ogs_assert(size >= 0);
+        encoded += size;
+
+        size = ogs_nas_5gs_encode_eap_message(pkbuf, &pdu_session_establishment_reject->eap_message);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    if (pdu_session_establishment_reject->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REJECT_ALLOWED_SSC_MODE_PRESENT) {
+        pdu_session_establishment_reject->allowed_ssc_mode.type = (OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REJECT_ALLOWED_SSC_MODE_TYPE >> 4);
+
+        size = ogs_nas_5gs_encode_allowed_ssc_mode(pkbuf, &pdu_session_establishment_reject->allowed_ssc_mode);
+        ogs_assert(size >= 0);
+        encoded += size;
+    }
+
+    if (pdu_session_establishment_reject->presencemask & OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REJECT_EXTENDED_PROTOCOL_CONFIGURATION_OPTIONS_PRESENT) {
+        size = ogs_nas_5gs_encode_optional_type(pkbuf, OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REJECT_EXTENDED_PROTOCOL_CONFIGURATION_OPTIONS_TYPE);
+        ogs_assert(size >= 0);

open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/gsmue-message.h Added

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2024 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/>.
+ */
+
+#ifndef GSM_MESSAGE_H
+#define GSM_MESSAGE_H
+
+#include "context.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ogs_pkbuf_t *gsmue_encode_n1_sm_info(ogs_nas_5gs_message_t *message);
+int gsmue_decode_n1_sm_info(ogs_nas_5gs_message_t *message, ogs_pkbuf_t *pkbuf);
+
+ogs_pkbuf_t *gsmue_build_pdu_session_establishment_accept(smf_sess_t *sess);
+ogs_pkbuf_t *gsmue_build_pdu_session_modification_command(smf_sess_t *sess);
+ogs_pkbuf_t *gsmue_build_pdu_session_release_command(smf_sess_t *sess);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GSM_MESSAGE_H */

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/gtp-path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/gtp-path.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -710,17 +710,17 @@
     ogs_list_for_each(&sess->pfcp.pdr_list, pdr) {
         if (pdr->src_if == OGS_PFCP_INTERFACE_CP_FUNCTION && pdr->gnode) {
             ogs_gtp2_header_desc_t header_desc;
-            ogs_pkbuf_t *newbuf = NULL;
+            ogs_gtp_node_t *gnode = pdr->gnode;
+            ogs_assert(gnode);
+            ogs_assert(gnode->sock);
 
             memset(&header_desc, 0, sizeof(header_desc));
-
             header_desc.type = OGS_GTPU_MSGTYPE_GPDU;
-            header_desc.teid = pdr->f_teid.teid;
 
-            newbuf = ogs_pkbuf_copy(pkbuf);
-            ogs_assert(newbuf);
+            ogs_gtp2_encapsulate_header(&header_desc, pkbuf);
 
-            ogs_gtp2_send_user_plane(pdr->gnode, &header_desc, newbuf);
+            ogs_gtp_send_with_teid(
+                    gnode->sock, pkbuf, pdr->f_teid.teid, &gnode->addr);
 
             ogs_debug("      Send Router Advertisement");
             break;

open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/local-path.c Added

@@ -0,0 +1,56 @@
+/*
+ * 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 "local-path.h"
+
+void smf_trigger_session_release(smf_sess_t *sess,
+    ogs_sbi_stream_t *stream, int pfcp_trigger)
+{
+    int rv;
+    smf_event_t *e;
+    ogs_pool_id_t sid;
+
+    /* Ensure session is valid */
+    ogs_assert(sess);
+
+    /* Create a session release event */
+    e = smf_event_new(SMF_EVT_SESSION_RELEASE);
+    ogs_assert(e);
+
+    /* Assign session ID */
+    e->sess_id = sess->id;
+
+    /* Store the PFCP trigger in the SBI state field */
+    e->h.sbi.state = pfcp_trigger;
+
+    /* Attach SBI stream ID if provided */
+    if (stream) {
+        sid = ogs_sbi_id_from_stream(stream);
+        ogs_assert(sid >= OGS_MIN_POOL_ID &&
+                   sid <= OGS_MAX_POOL_ID);
+        e->h.sbi.data = OGS_UINT_TO_POINTER(sid);
+    }
+
+    /* Push event to the application queue */
+    rv = ogs_queue_push(ogs_app()->queue, e);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_queue_push failed:%d", rv);
+        ogs_event_free(e);
+    }
+}

open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/local-path.h Added

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2025 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/>.
+ */
+
+#ifndef SMF_LOCAL_PATH_H
+#define SMF_LOCAL_PATH_H
+
+#include "context.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void smf_trigger_session_release(smf_sess_t *sess,
+    ogs_sbi_stream_t *stream, int pfcp_trigger);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SMF_LOCAL_PATH_H */

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/meson.build -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/meson.build Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/n4-build.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/n4-build.c Changed

@@ -115,8 +115,10 @@
     }
 
     /* PDN Type */
-    req->pdn_type.presence = 1;
-    req->pdn_type.u8 = sess->session.session_type;
+    if (sess->session.session_type) {
+        req->pdn_type.presence = 1;
+        req->pdn_type.u8 = sess->session.session_type;
+    }
 
     /* User ID */
     memset(&user_id, 0, sizeof(ogs_pfcp_user_id_t));
@@ -183,7 +185,6 @@
 {
     ogs_pfcp_pdr_t *pdr = NULL;
     ogs_pfcp_urr_t *urr = NULL;
-    int i;
 
     ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_modification_request_t *req = NULL;
@@ -193,7 +194,10 @@
     int num_of_remove_far = 0;
     int num_of_create_pdr = 0;
     int num_of_create_far = 0;
+    int num_of_update_pdr = 0;
     int num_of_update_far = 0;
+    int num_of_update_qer = 0;
+    int num_of_update_urr = 0;
 
     uint64_t modify_flags = 0;
 
@@ -264,6 +268,13 @@
                         num_of_create_far, far);
 
                 num_of_create_far++;
+            }
+
+            if (modify_flags & OGS_PFCP_MODIFY_DEACTIVATE) {
+                ogs_pfcp_build_update_far_deactivate(
+                        &req->update_farnum_of_update_far,
+                        num_of_update_far, far);
+                num_of_update_far++;
             } else if (modify_flags & OGS_PFCP_MODIFY_ACTIVATE) {
                 if (far->apply_action & OGS_PFCP_APPLY_ACTION_FORW) {
 
@@ -280,26 +291,52 @@
 
                     num_of_update_far++;
                 }
-            } else if (modify_flags & OGS_PFCP_MODIFY_DEACTIVATE) {
-                ogs_pfcp_build_update_far_deactivate(
-                        &req->update_farnum_of_update_far,
-                        num_of_update_far, far);
-                num_of_update_far++;
-            } else if (modify_flags == 0) {
-                ogs_fatal("Invalid modify_flags = %lld",
-                        (long long)modify_flags);
-                ogs_assert_if_reached();
             }
-        }
 
+            if (modify_flags &
+                    (OGS_PFCP_MODIFY_TFT_NEW|OGS_PFCP_MODIFY_TFT_ADD|
+                     OGS_PFCP_MODIFY_TFT_REPLACE|OGS_PFCP_MODIFY_TFT_DELETE|
+                     OGS_PFCP_MODIFY_EPC_TFT_UPDATE|
+                     OGS_PFCP_MODIFY_OUTER_HEADER_REMOVAL)) {
+                /* Update PDR */
+                ogs_pfcp_build_update_pdr(
+                        &req->update_pdrnum_of_update_pdr,
+                        num_of_update_pdr, pdr, modify_flags);
+                num_of_update_pdr++;
+            }
+            if (modify_flags &
+                    (OGS_PFCP_MODIFY_QOS_MODIFY|
+                     OGS_PFCP_MODIFY_EPC_QOS_UPDATE)) {
+                /* Update QER */
+                if (pdr->qer) {
+                    ogs_pfcp_build_update_qer(
+                            &req->update_qernum_of_update_qer,
+                            num_of_update_qer, pdr->qer, modify_flags);
+                    num_of_update_qer++;
+                }
+            }
+        }
     }
 
-    /* Update URR */
-    i = 0;
-    ogs_list_for_each(&sess->pfcp.urr_list, urr) {
-        ogs_pfcp_build_update_urr(&req->update_urri, i, urr, modify_flags);
-        i++;
+    if (modify_flags &
+            (OGS_PFCP_MODIFY_URR_MEAS_METHOD|
+             OGS_PFCP_MODIFY_URR_REPORT_TRIGGER|
+             OGS_PFCP_MODIFY_URR_VOLUME_THRESH|
+             OGS_PFCP_MODIFY_URR_VOLUME_QUOTA|
+             OGS_PFCP_MODIFY_URR_TIME_THRESH|
+             OGS_PFCP_MODIFY_URR_TIME_QUOTA|
+             OGS_PFCP_MODIFY_URR_QUOTA_VALIDITY_TIME)) {
+        /* Update URR */
+        ogs_list_for_each(&sess->pfcp.urr_list, urr) {
+            ogs_pfcp_build_update_urr(
+                    &req->update_urrnum_of_update_urr,
+                    num_of_update_urr, urr, modify_flags);
+            num_of_update_urr++;
+        }
     }
+    ogs_assert(num_of_remove_pdr + num_of_remove_far + num_of_create_pdr +
+            num_of_create_far + num_of_update_pdr + num_of_update_far +
+            num_of_update_qer + num_of_update_urr);
 
     pfcp_message->h.type = type;
     pkbuf = ogs_pfcp_build_msg(pfcp_message);
@@ -357,7 +394,8 @@
             (OGS_PFCP_MODIFY_CREATE|
              OGS_PFCP_MODIFY_TFT_NEW|OGS_PFCP_MODIFY_TFT_ADD|
              OGS_PFCP_MODIFY_TFT_REPLACE|OGS_PFCP_MODIFY_TFT_DELETE|
-             OGS_PFCP_MODIFY_EPC_TFT_UPDATE)) {
+             OGS_PFCP_MODIFY_EPC_TFT_UPDATE|
+             OGS_PFCP_MODIFY_OUTER_HEADER_REMOVAL)) {
         ogs_pfcp_pdrbuf_init();
     }
 
@@ -366,7 +404,8 @@
 
         if (modify_flags & OGS_PFCP_MODIFY_REMOVE) {
             /* Remove PDR */
-            if (qos_flow->dl_pdr) {
+            if ((modify_flags & OGS_PFCP_MODIFY_UL_ONLY) == 0 &&
+                qos_flow->dl_pdr) {
                 ogs_pfcp_tlv_remove_pdr_t *message =
                     &req->remove_pdrnum_of_remove_pdr;
 
@@ -375,7 +414,8 @@
                 message->pdr_id.u16 = qos_flow->dl_pdr->id;
                 num_of_remove_pdr++;
             }
-            if (qos_flow->ul_pdr) {
+            if ((modify_flags & OGS_PFCP_MODIFY_DL_ONLY) == 0 &&
+                qos_flow->ul_pdr) {
                 ogs_pfcp_tlv_remove_pdr_t *message =
                     &req->remove_pdrnum_of_remove_pdr;
 
@@ -386,7 +426,8 @@
             }
 
             /* Remove FAR */
-            if (qos_flow->dl_far) {
+            if ((modify_flags & OGS_PFCP_MODIFY_UL_ONLY) == 0 &&
+                qos_flow->dl_far) {
                 ogs_pfcp_tlv_remove_far_t *message =
                     &req->remove_farnum_of_remove_far;
 
@@ -395,7 +436,8 @@
                 message->far_id.u32 = qos_flow->dl_far->id;
                 num_of_remove_far++;
             }
-            if (qos_flow->ul_far) {
+            if ((modify_flags & OGS_PFCP_MODIFY_DL_ONLY) == 0 &&
+                qos_flow->ul_far) {
                 ogs_pfcp_tlv_remove_far_t *message =
                     &req->remove_farnum_of_remove_far;
 
@@ -427,126 +469,173 @@
                 num_of_remove_urr++;
             }
 
-        } else {
-            if (modify_flags & OGS_PFCP_MODIFY_CREATE) {
-
-                /* Create PDR */
-                if (qos_flow->dl_pdr) {
-                    ogs_pfcp_build_create_pdr(
-                            &req->create_pdrnum_of_create_pdr,
-                            num_of_create_pdr, qos_flow->dl_pdr);
-                    num_of_create_pdr++;
+        } else if (modify_flags & OGS_PFCP_MODIFY_CREATE) {
+            /* Create PDR */
+            if ((modify_flags & OGS_PFCP_MODIFY_UL_ONLY) == 0 &&
+                qos_flow->dl_pdr) {
+                ogs_pfcp_build_create_pdr(
+                        &req->create_pdrnum_of_create_pdr,
+                        num_of_create_pdr, qos_flow->dl_pdr);
+                num_of_create_pdr++;
 
-                    ogs_list_add(&xact->pdr_to_create_list,
-                                    &qos_flow->dl_pdr->to_create_node);
-                }
-                if (qos_flow->ul_pdr) {
-                    ogs_pfcp_build_create_pdr(
-                            &req->create_pdrnum_of_create_pdr,
-                            num_of_create_pdr, qos_flow->ul_pdr);
-                    num_of_create_pdr++;
+                ogs_list_add(&xact->pdr_to_create_list,
+                                &qos_flow->dl_pdr->to_create_node);
+            }
+            if ((modify_flags & OGS_PFCP_MODIFY_DL_ONLY) == 0 &&
+                qos_flow->ul_pdr) {
+                ogs_pfcp_build_create_pdr(

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/n4-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/n4-handler.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -197,23 +197,38 @@
         far = pdr->far;
         ogs_assert(far);
 
-        if (pdr->src_if == OGS_PFCP_INTERFACE_ACCESS) {
+        if (pdr->src_if == OGS_PFCP_INTERFACE_CORE) {
+            ogs_assert(sess->pfcp_node);
+            if (sess->pfcp_node->up_function_features.ftup &&
+                pdr->f_teid_len) {
+                if (sess->local_dl_addr)
+                    ogs_freeaddrinfo(sess->local_dl_addr);
+                if (sess->local_dl_addr6)
+                    ogs_freeaddrinfo(sess->local_dl_addr6);
+
+                ogs_assert(OGS_OK ==
+                    ogs_pfcp_f_teid_to_sockaddr(
+                        &pdr->f_teid, pdr->f_teid_len,
+                        &sess->local_dl_addr, &sess->local_dl_addr6));
+                sess->local_dl_teid = pdr->f_teid.teid;
+            }
+        } else if (pdr->src_if == OGS_PFCP_INTERFACE_ACCESS) {
             if (far->dst_if == OGS_PFCP_INTERFACE_CP_FUNCTION)
                 ogs_pfcp_far_teid_hash_set(far);
 
             ogs_assert(sess->pfcp_node);
             if (sess->pfcp_node->up_function_features.ftup &&
                 pdr->f_teid_len) {
-                if (sess->upf_n3_addr)
-                    ogs_freeaddrinfo(sess->upf_n3_addr);
-                if (sess->upf_n3_addr6)
-                    ogs_freeaddrinfo(sess->upf_n3_addr6);
+                if (sess->local_ul_addr)
+                    ogs_freeaddrinfo(sess->local_ul_addr);
+                if (sess->local_ul_addr6)
+                    ogs_freeaddrinfo(sess->local_ul_addr6);
 
                 ogs_assert(OGS_OK ==
                     ogs_pfcp_f_teid_to_sockaddr(
                         &pdr->f_teid, pdr->f_teid_len,
-                        &sess->upf_n3_addr, &sess->upf_n3_addr6));
-                sess->upf_n3_teid = pdr->f_teid.teid;
+                        &sess->local_ul_addr, &sess->local_ul_addr6));
+                sess->local_ul_teid = pdr->f_teid.teid;
             }
         } else if (pdr->src_if == OGS_PFCP_INTERFACE_CP_FUNCTION) {
             ogs_assert(OGS_ERROR != ogs_pfcp_setup_pdr_gtpu_node(pdr));
@@ -225,7 +240,7 @@
         return cause_value;
     }
 
-    if (sess->upf_n3_addr == NULL && sess->upf_n3_addr6 == NULL) {
+    if (sess->local_ul_addr == NULL && sess->local_ul_addr6 == NULL) {
         ogs_error("No UP F-TEID");
         return OGS_PFCP_CAUSE_SESSION_CONTEXT_NOT_FOUND;
     }
@@ -242,8 +257,9 @@
         smf_sess_t *sess, ogs_pfcp_xact_t *xact,
         ogs_pfcp_session_modification_response_t *rsp)
 {
-    int status = 0;
+    int r, status = 0;
     uint64_t flags = 0;
+    int trigger = 0;
     ogs_sbi_stream_t *stream = NULL;
     smf_bearer_t *qos_flow = NULL;
 
@@ -256,6 +272,7 @@
 
     flags = xact->modify_flags;
     ogs_assert(flags);
+    trigger = xact->delete_trigger;
 
     /* 'stream' could be NULL in smf_qos_flow_binding() */
     if (xact->assoc_stream_id >= OGS_MIN_POOL_ID &&
@@ -314,7 +331,22 @@
             far = pdr->far;
             ogs_assert(far);
 
-            if (pdr->src_if == OGS_PFCP_INTERFACE_ACCESS) {
+            if (pdr->src_if == OGS_PFCP_INTERFACE_CORE) {
+                ogs_assert(sess->pfcp_node);
+                if (sess->pfcp_node->up_function_features.ftup &&
+                    pdr->f_teid_len) {
+                    if (sess->local_dl_addr)
+                        ogs_freeaddrinfo(sess->local_dl_addr);
+                    if (sess->local_dl_addr6)
+                        ogs_freeaddrinfo(sess->local_dl_addr6);
+
+                    ogs_assert(OGS_OK ==
+                        ogs_pfcp_f_teid_to_sockaddr(
+                            &pdr->f_teid, pdr->f_teid_len,
+                            &sess->local_dl_addr, &sess->local_dl_addr6));
+                    sess->local_dl_teid = pdr->f_teid.teid;
+                }
+            } else if (pdr->src_if == OGS_PFCP_INTERFACE_ACCESS) {
                 if (far->dst_if == OGS_PFCP_INTERFACE_CP_FUNCTION)
                     ogs_pfcp_far_teid_hash_set(far);
 
@@ -323,28 +355,28 @@
                     pdr->f_teid_len) {
 
                     if (far->dst_if == OGS_PFCP_INTERFACE_CORE) {
-                        if (sess->upf_n3_addr)
-                            ogs_freeaddrinfo(sess->upf_n3_addr);
-                        if (sess->upf_n3_addr6)
-                            ogs_freeaddrinfo(sess->upf_n3_addr6);
+                        if (sess->local_ul_addr)
+                            ogs_freeaddrinfo(sess->local_ul_addr);
+                        if (sess->local_ul_addr6)
+                            ogs_freeaddrinfo(sess->local_ul_addr6);
 
                         ogs_assert(OGS_OK ==
                             ogs_pfcp_f_teid_to_sockaddr(
                                 &pdr->f_teid, pdr->f_teid_len,
-                                &sess->upf_n3_addr, &sess->upf_n3_addr6));
-                        sess->upf_n3_teid = pdr->f_teid.teid;
+                                &sess->local_ul_addr, &sess->local_ul_addr6));
+                        sess->local_ul_teid = pdr->f_teid.teid;
                     } else if (far->dst_if == OGS_PFCP_INTERFACE_ACCESS) {
-                        if (sess->handover.upf_dl_addr)
-                            ogs_freeaddrinfo(sess->handover.upf_dl_addr);
-                        if (sess->handover.upf_dl_addr6)
-                            ogs_freeaddrinfo(sess->handover.upf_dl_addr6);
+                        if (sess->handover.local_dl_addr)
+                            ogs_freeaddrinfo(sess->handover.local_dl_addr);
+                        if (sess->handover.local_dl_addr6)
+                            ogs_freeaddrinfo(sess->handover.local_dl_addr6);
 
                         ogs_assert(OGS_OK ==
                             ogs_pfcp_f_teid_to_sockaddr(
                                 &pdr->f_teid, pdr->f_teid_len,
-                                &sess->handover.upf_dl_addr,
-                                &sess->handover.upf_dl_addr6));
-                        sess->handover.upf_dl_teid = pdr->f_teid.teid;
+                                &sess->handover.local_dl_addr,
+                                &sess->handover.local_dl_addr6));
+                        sess->handover.local_dl_teid = pdr->f_teid.teid;
                     }
                 }
             } else if (pdr->src_if == OGS_PFCP_INTERFACE_CP_FUNCTION) {
@@ -368,14 +400,396 @@
 
     ogs_assert(sess);
 
-    if (sess->upf_n3_addr == NULL && sess->upf_n3_addr6 == NULL) {
+    if (sess->local_ul_addr == NULL && sess->local_ul_addr6 == NULL) {
         if (stream)
             smf_sbi_send_sm_context_update_error_log(
                     stream, status, "No UP F_TEID", NULL);
         return;
     }
 
-    if (flags & OGS_PFCP_MODIFY_ACTIVATE) {
+    if (flags & OGS_PFCP_MODIFY_HOME_ROUTED_ROAMING) {
+        if (flags & OGS_PFCP_MODIFY_ACTIVATE) {
+            if ((flags & OGS_PFCP_MODIFY_XN_HANDOVER) ||
+                (flags & OGS_PFCP_MODIFY_N2_HANDOVER)) {
+                sess->nsmf_param.request_indication =
+                    OpenAPI_request_indication_UE_REQ_PDU_SES_MOD;
+
+                sess->nsmf_param.up_cnx_state = OpenAPI_up_cnx_state_ACTIVATED;
+
+                sess->nsmf_param.serving_network = true;
+
+                ogs_assert(OGS_OK ==
+                        ogs_sockaddr_to_ip(
+                            sess->local_dl_addr, sess->local_dl_addr6,
+                            &sess->nsmf_param.dl_ip));
+                sess->nsmf_param.dl_teid = sess->local_dl_teid;
+
+                sess->nsmf_param.an_type = sess->an_type;
+                sess->nsmf_param.rat_type = sess->sbi_rat_type;
+
+                r = smf_sbi_discover_and_send(
+                        OGS_SBI_SERVICE_TYPE_NSMF_PDUSESSION, NULL,
+                        smf_nsmf_pdusession_build_hsmf_update_data,
+                        sess, stream,
+                        flags & OGS_PFCP_MODIFY_XN_HANDOVER ?
+                            SMF_UPDATE_STATE_ACTIVATED_FROM_XN_HANDOVER :
+                            SMF_UPDATE_STATE_ACTIVATED_FROM_N2_HANDOVER,
+                        NULL);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
+
+            } else if (flags & OGS_PFCP_MODIFY_DL_ONLY) {
+    /*
+     * UE-requested PDU Session Modification(ACTIVATED)
+     *
+     * 1.  V: OGS_PFCP_MODIFY_HOME_ROUTED_ROAMING|OGS_PFCP_MODIFY_DL_ONLY|
+     *        OGS_PFCP_MODIFY_OUTER_HEADER_REMOVAL|OGS_PFCP_MODIFY_ACTIVATE
+     * 2.  V: if (sess->up_cnx_state == OpenAPI_up_cnx_state_ACTIVATING)
+     *           pfcp_flags |= OGS_PFCP_MODIFY_FROM_ACTIVATING;
+     * 3.  V*: flags & OGS_PFCP_MODIFY_FROM_ACTIVATING ?

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/namf-build.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/namf-build.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/namf-build.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/namf-build.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/namf-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/namf-handler.c Changed

@@ -23,7 +23,8 @@
 #include "namf-handler.h"
 
 bool smf_namf_comm_handle_n1_n2_message_transfer(
-        smf_sess_t *sess, int state, ogs_sbi_message_t *recvmsg)
+        smf_sess_t *sess, ogs_sbi_stream_t *stream,
+        int state, ogs_sbi_message_t *recvmsg)
 {
     smf_ue_t *smf_ue = NULL;
     OpenAPI_n1_n2_message_transfer_rsp_data_t *N1N2MessageTransferRspData;
@@ -37,6 +38,15 @@
     switch (state) {
     case SMF_UE_REQUESTED_PDU_SESSION_ESTABLISHMENT:
         if (recvmsg->res_status == OGS_SBI_HTTP_STATUS_OK) {
+/*
+ * Non-roaming/LBO: start network-triggered PDU Session Modification at step 11
+ * after N1N2 transfer (Establishment Accept) and N2/N4 context sync, ensuring
+ * the session is active on UE, RAN, and SMF before applying QoS updates.
+ *
+ * Home-Routed Roaming: trigger PDU Session Modification at step 13
+ * immediately after H-SMF’s CreateSMContext response and H-UPF N4 setup
+ * to apply QoS updates without waiting for V-SMF or RAN setup.
+ */
             smf_qos_flow_binding(sess);
         } else {
             ogs_error("%s:%d HTTP response error %d",
@@ -56,7 +66,17 @@
         if (recvmsg->res_status == OGS_SBI_HTTP_STATUS_OK) {
             if (N1N2MessageTransferRspData->cause ==
                 OpenAPI_n1_n2_message_transfer_cause_N1_N2_TRANSFER_INITIATED) {
-                /* Nothing */
+                if (stream) {
+                    if (sess->vsmf_to_hsmf_modify_stream_id >=
+                            OGS_MIN_POOL_ID &&
+                        sess->vsmf_to_hsmf_modify_stream_id <=
+                            OGS_MAX_POOL_ID)
+                        ogs_error("N1 N2 modified stream ID %d"
+                                "has not been used yet",
+                                sess->vsmf_to_hsmf_modify_stream_id);
+                    sess->vsmf_to_hsmf_modify_stream_id =
+                        ogs_sbi_id_from_stream(stream);
+                }
             } else {
                 ogs_error("Not implemented cause:%d",
                         N1N2MessageTransferRspData->cause);
@@ -70,6 +90,18 @@
                             sess, recvmsg->http.location);
                 else
                     ogs_error("No HTTP Location");
+
+                if (stream) {
+                    if (sess->vsmf_to_hsmf_modify_stream_id >=
+                            OGS_MIN_POOL_ID &&
+                        sess->vsmf_to_hsmf_modify_stream_id <=
+                            OGS_MAX_POOL_ID)
+                        ogs_error("N1 N2 modified stream ID %d"
+                                "has not been used yet",
+                                sess->vsmf_to_hsmf_modify_stream_id);
+                    sess->vsmf_to_hsmf_modify_stream_id =
+                        ogs_sbi_id_from_stream(stream);
+                }
             } else {
                 ogs_error("Not implemented cause:%d",
                         N1N2MessageTransferRspData->cause);
@@ -104,7 +136,7 @@
         }
         break;
 
-    case SMF_NETWORK_REQUESTED_PDU_SESSION_RELEASE:
+    case SMF_UE_OR_NETWORK_REQUESTED_PDU_SESSION_RELEASE:
     case SMF_ERROR_INDICATON_RECEIVED_FROM_5G_AN:
 
         N1N2MessageTransferRspData = recvmsg->N1N2MessageTransferRspData;
@@ -158,10 +190,19 @@
 
                 param.n1n2_failure_txf_notif_uri = true;
 
-                smf_namf_comm_send_n1_n2_message_transfer(sess, &param);
+                smf_namf_comm_send_n1_n2_message_transfer(sess, NULL, &param);
             } else if (N1N2MessageTransferRspData->cause ==
                 OpenAPI_n1_n2_message_transfer_cause_N1_N2_TRANSFER_INITIATED) {
-                /* Nothing */
+                if (stream) {
+                    if (sess->vsmf_to_hsmf_release_stream_id >=
+                            OGS_MIN_POOL_ID &&
+                        sess->vsmf_to_hsmf_release_stream_id <= OGS_MAX_POOL_ID)
+                        ogs_error("N1 N2 released stream ID %d"
+                                "has not been used yet",
+                                sess->vsmf_to_hsmf_release_stream_id);
+                    sess->vsmf_to_hsmf_release_stream_id =
+                        ogs_sbi_id_from_stream(stream);
+                }
             } else {
                 ogs_error("Not implemented cause:%d",
                         N1N2MessageTransferRspData->cause);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/namf-handler.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/namf-handler.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/ngap-build.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/ngap-build.c Changed

@@ -19,6 +19,68 @@
 
 #include "ngap-build.h"
 
+/**
+ * Fill common QoS flow level parameters: 5QI, ARP, and optional GBR/MBR.
+ */
+static void fill_qos_level_parameters(
+    NGAP_QosFlowLevelQosParameters_t *params,
+    const ogs_qos_t *qos,
+    bool include_gbr)
+{
+    NGAP_AllocationAndRetentionPriority_t
+        *allocationAndRetentionPriority = NULL;
+    NGAP_QosCharacteristics_t *qosCharacteristics = NULL;
+    NGAP_NonDynamic5QIDescriptor_t *nonDynamic5QI = NULL;
+
+    /* Allocation and Retention Priority */
+    allocationAndRetentionPriority =
+        &params->allocationAndRetentionPriority;
+
+    allocationAndRetentionPriority->priorityLevelARP = qos->arp.priority_level;
+    if (qos->arp.pre_emption_capability == OGS_5GC_PRE_EMPTION_ENABLED)
+        allocationAndRetentionPriority->pre_emptionCapability =
+            NGAP_Pre_emptionCapability_may_trigger_pre_emption;
+    if (qos->arp.pre_emption_vulnerability == OGS_5GC_PRE_EMPTION_ENABLED)
+        allocationAndRetentionPriority->pre_emptionVulnerability =
+            NGAP_Pre_emptionVulnerability_pre_emptable;
+
+    /* Non-Dynamic 5QI Descriptor */
+    qosCharacteristics = &params->qosCharacteristics;
+    qosCharacteristics->choice.nonDynamic5QI = nonDynamic5QI =
+        CALLOC(1, sizeof(struct NGAP_NonDynamic5QIDescriptor));
+    ogs_assert(nonDynamic5QI);
+    qosCharacteristics->present = NGAP_QosCharacteristics_PR_nonDynamic5QI;
+
+    nonDynamic5QI->fiveQI = qos->index;
+
+    /* Optional GBR/MBR Information */
+    if (include_gbr &&
+        qos->mbr.downlink && qos->mbr.uplink &&
+        qos->gbr.downlink && qos->gbr.uplink) {
+        NGAP_GBR_QosInformation_t *gBR_QosInformation =
+            params->gBR_QosInformation = CALLOC(1, sizeof(*gBR_QosInformation));
+        ogs_assert(gBR_QosInformation);
+
+        asn_uint642INTEGER(&gBR_QosInformation->maximumFlowBitRateDL,
+                qos->mbr.downlink);
+        asn_uint642INTEGER(&gBR_QosInformation->maximumFlowBitRateUL,
+                qos->mbr.uplink);
+        asn_uint642INTEGER(&gBR_QosInformation->
+                guaranteedFlowBitRateDL, qos->gbr.downlink);
+        asn_uint642INTEGER(&gBR_QosInformation->
+                guaranteedFlowBitRateUL, qos->gbr.uplink);
+    } else if (include_gbr &&
+               (qos->mbr.downlink || qos->mbr.uplink ||
+                qos->gbr.downlink || qos->gbr.uplink)) {
+        ogs_error("Missing one or more MBR/GBR parameters; "
+                "defaulting to Non-GBR flow ");
+        ogs_error("    MBRDL:%lld,UL:%lld",
+            (long long)qos->mbr.downlink, (long long)qos->mbr.uplink);
+        ogs_error("    GBRDL:%lld,UL:%lld",
+            (long long)qos->gbr.downlink, (long long)qos->gbr.uplink);
+    }
+}
+
 ogs_pkbuf_t *ngap_build_pdu_session_resource_setup_request_transfer(
         smf_sess_t *sess)
 {
@@ -36,12 +98,6 @@
     NGAP_SecurityIndication_t *SecurityIndication = NULL;
     NGAP_QosFlowSetupRequestList_t *QosFlowSetupRequestList = NULL;
     NGAP_QosFlowSetupRequestItem_t *QosFlowSetupRequestItem = NULL;
-    NGAP_QosFlowIdentifier_t *qosFlowIdentifier = NULL;
-    NGAP_QosFlowLevelQosParameters_t *qosFlowLevelQosParameters = NULL;
-    NGAP_QosCharacteristics_t *qosCharacteristics = NULL;
-    NGAP_NonDynamic5QIDescriptor_t *nonDynamic5QI = NULL;
-    NGAP_AllocationAndRetentionPriority_t *allocationAndRetentionPriority;
-    NGAP_GBR_QosInformation_t *gBR_QosInformation = NULL;
 
     ogs_assert(sess);
 
@@ -84,10 +140,10 @@
     UPTransportLayerInformation->choice.gTPTunnel = gTPTunnel;
 
     ogs_assert(OGS_OK == ogs_sockaddr_to_ip(
-                sess->upf_n3_addr, sess->upf_n3_addr6, &upf_n3_ip));
+                sess->local_ul_addr, sess->local_ul_addr6, &upf_n3_ip));
     ogs_assert(OGS_OK == ogs_asn_ip_to_BIT_STRING(
                 &upf_n3_ip, &gTPTunnel->transportLayerAddress));
-    ogs_asn_uint32_to_OCTET_STRING(sess->upf_n3_teid, &gTPTunnel->gTP_TEID);
+    ogs_asn_uint32_to_OCTET_STRING(sess->local_ul_teid, &gTPTunnel->gTP_TEID);
 
     if (sess->handover.data_forwarding_not_possible == true) {
         ie = CALLOC(1,
@@ -181,7 +237,8 @@
 
             if (smf_self()->security_indication.
                     maximum_integrity_protected_data_rate_downlink) {
-                NGAP_ProtocolExtensionContainer_11905P297_t *extContainer = NULL;
+                NGAP_ProtocolExtensionContainer_11905P297_t
+                    *extContainer = NULL;
                 NGAP_SecurityIndication_ExtIEs_t *extIe = NULL;
                 NGAP_MaximumIntegrityProtectedDataRate_t
                     *MaximumIntegrityProtectedDataRate = NULL;
@@ -224,69 +281,79 @@
 
     QosFlowSetupRequestList = &ie->value.choice.QosFlowSetupRequestList;
 
-    ogs_list_for_each(&sess->bearer_list, qos_flow) {
+    if (HOME_ROUTED_ROAMING_IN_VSMF(sess)) {
+        OpenAPI_list_t *qosFlowsSetupList = NULL;
+        OpenAPI_qos_flow_setup_item_t *qosFlowSetupItem = NULL;
+        OpenAPI_qos_flow_profile_t *qosFlowProfile = NULL;
+        OpenAPI_lnode_t *node = NULL;
+
+        ogs_qos_t qos;
+
+        qosFlowsSetupList = sess->h_smf_qos_flows_setup_list;
+        ogs_assert(qosFlowsSetupList);
+
+        node = qosFlowsSetupList->first;
+        ogs_assert(node);
+        qosFlowSetupItem = node->data;
+        ogs_assert(qosFlowSetupItem);
+
+        qosFlowProfile = qosFlowSetupItem->qos_flow_profile;
+        ogs_assert(qosFlowProfile);
+
+        memset(&qos, 0, sizeof(qos));
+
+        qos.index = qosFlowProfile->_5qi;
+        ogs_assert(qosFlowProfile->arp);
+        qos.arp.priority_level = qosFlowProfile->arp->priority_level;
+        if (qosFlowProfile->arp->preempt_cap ==
+            OpenAPI_preemption_capability_NOT_PREEMPT)
+            qos.arp.pre_emption_capability = OGS_5GC_PRE_EMPTION_DISABLED;
+        else if (qosFlowProfile->arp->preempt_cap ==
+            OpenAPI_preemption_capability_MAY_PREEMPT)
+            qos.arp.pre_emption_capability = OGS_5GC_PRE_EMPTION_ENABLED;
+        else {
+            ogs_error("Invalid preempt_cap %d",
+                    qosFlowProfile->arp->preempt_cap);
+            ogs_assert_if_reached();
+        }
+
+        if (qosFlowProfile->arp->preempt_vuln ==
+            OpenAPI_preemption_vulnerability_NOT_PREEMPTABLE)
+            qos.arp.pre_emption_vulnerability = OGS_5GC_PRE_EMPTION_DISABLED;
+        else if (qosFlowProfile->arp->preempt_vuln ==
+            OpenAPI_preemption_vulnerability_PREEMPTABLE)
+            qos.arp.pre_emption_vulnerability = OGS_5GC_PRE_EMPTION_ENABLED;
+        else {
+            ogs_error("Invalid preempt_vuln %d",
+                    qosFlowProfile->arp->preempt_vuln);
+            ogs_assert_if_reached();
+        }
+
         QosFlowSetupRequestItem =
             CALLOC(1, sizeof(struct NGAP_QosFlowSetupRequestItem));
         ogs_assert(QosFlowSetupRequestItem);
         ASN_SEQUENCE_ADD(&QosFlowSetupRequestList->list,
             QosFlowSetupRequestItem);
 
-        qosFlowIdentifier = &QosFlowSetupRequestItem->qosFlowIdentifier;
-        qosFlowLevelQosParameters =
-            &QosFlowSetupRequestItem->qosFlowLevelQosParameters;
-
-        allocationAndRetentionPriority =
-            &qosFlowLevelQosParameters->allocationAndRetentionPriority;
-        qosCharacteristics = &qosFlowLevelQosParameters->qosCharacteristics;
-        nonDynamic5QI = CALLOC(1, sizeof(struct NGAP_NonDynamic5QIDescriptor));
-        ogs_assert(nonDynamic5QI);
-        qosCharacteristics->choice.nonDynamic5QI = nonDynamic5QI;
-        qosCharacteristics->present = NGAP_QosCharacteristics_PR_nonDynamic5QI;
-
-        *qosFlowIdentifier = qos_flow->qfi;
-
-        nonDynamic5QI->fiveQI = qos_flow->qos.index;
-
-        allocationAndRetentionPriority->priorityLevelARP =
-            qos_flow->qos.arp.priority_level;
-        if (qos_flow->qos.arp.pre_emption_capability ==
-                OGS_5GC_PRE_EMPTION_ENABLED)
-            allocationAndRetentionPriority->pre_emptionCapability =
-                NGAP_Pre_emptionCapability_may_trigger_pre_emption;
-        if (qos_flow->qos.arp.pre_emption_vulnerability ==
-                OGS_5GC_PRE_EMPTION_ENABLED)
-            allocationAndRetentionPriority->pre_emptionVulnerability =
-                NGAP_Pre_emptionVulnerability_pre_emptable;
-
-        if (qos_flow->qos.mbr.downlink || qos_flow->qos.mbr.uplink ||
-            qos_flow->qos.gbr.downlink || qos_flow->qos.gbr.uplink) {
-
-            if (qos_flow->qos.mbr.downlink && qos_flow->qos.mbr.uplink &&
-                qos_flow->qos.gbr.downlink && qos_flow->qos.gbr.uplink) {
-
-                qosFlowLevelQosParameters->gBR_QosInformation =
-                    gBR_QosInformation = CALLOC(1, sizeof(*gBR_QosInformation));
-                ogs_assert(gBR_QosInformation);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/ngap-build.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/ngap-build.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/ngap-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/ngap-handler.c Changed

@@ -26,10 +26,12 @@
         smf_sess_t *sess, ogs_sbi_stream_t *stream, ogs_pkbuf_t *pkbuf)
 {
     smf_ue_t *smf_ue = NULL;
-    int rv, i;
+    smf_bearer_t *qos_flow = NULL;
 
-    uint32_t gnb_n3_teid;
-    ogs_ip_t gnb_n3_ip;
+    int rv, i, r;
+
+    uint32_t remote_dl_teid;
+    ogs_ip_t remote_dl_ip;
 
     bool far_update = false;
 
@@ -92,7 +94,7 @@
     }
 
     rv = ogs_asn_BIT_STRING_to_ip(
-            &gTPTunnel->transportLayerAddress, &gnb_n3_ip);
+            &gTPTunnel->transportLayerAddress, &remote_dl_ip);
     if (rv != OGS_OK) {
         ogs_error("%s:%d No transportLayerAddress", smf_ue->supi, sess->psi);
         smf_sbi_send_sm_context_update_error_log(
@@ -100,67 +102,141 @@
                 "No transportLayerAddress", smf_ue->supi);
         goto cleanup;
     }
-    ogs_asn_OCTET_STRING_to_uint32(&gTPTunnel->gTP_TEID, &gnb_n3_teid);
+    ogs_asn_OCTET_STRING_to_uint32(&gTPTunnel->gTP_TEID, &remote_dl_teid);
 
     /* Need to Update? */
-    if (memcmp(&sess->gnb_n3_ip, &gnb_n3_ip, sizeof(sess->gnb_n3_ip)) != 0 ||
-        sess->gnb_n3_teid != gnb_n3_teid)
+    if (memcmp(&sess->remote_dl_ip,
+                &remote_dl_ip, sizeof(sess->remote_dl_ip)) != 0 ||
+        sess->remote_dl_teid != remote_dl_teid)
         far_update = true;
 
     /* Setup FAR */
-    memcpy(&sess->gnb_n3_ip, &gnb_n3_ip, sizeof(sess->gnb_n3_ip));
-    sess->gnb_n3_teid = gnb_n3_teid;
+    memcpy(&sess->remote_dl_ip, &remote_dl_ip, sizeof(sess->remote_dl_ip));
+    sess->remote_dl_teid = remote_dl_teid;
 
-    associatedQosFlowList = &dLQosFlowPerTNLInformation->associatedQosFlowList;
-    for (i = 0; i < associatedQosFlowList->list.count; i++) {
-        NGAP_AssociatedQosFlowItem_t *associatedQosFlowItem = NULL;
-        associatedQosFlowItem = (NGAP_AssociatedQosFlowItem_t *)
-                associatedQosFlowList->list.arrayi;
-
-        if (associatedQosFlowItem) {
-            smf_bearer_t *qos_flow = smf_qos_flow_find_by_qfi(
-                    sess, associatedQosFlowItem->qosFlowIdentifier);
-
-            if (qos_flow) {
-                ogs_pfcp_far_t *dl_far = qos_flow->dl_far;
-                ogs_assert(dl_far);
-                if (dl_far->apply_action != OGS_PFCP_APPLY_ACTION_FORW) {
-                    far_update = true;
-                }
+    if (HOME_ROUTED_ROAMING_IN_VSMF(sess)) {
+        ogs_list_for_each(&sess->bearer_list, qos_flow) {
+            ogs_pfcp_far_t *dl_far = qos_flow->dl_far;
+            ogs_assert(dl_far);
+            if (dl_far->apply_action != OGS_PFCP_APPLY_ACTION_FORW) {
+                far_update = true;
+            }
 
-                dl_far->apply_action = OGS_PFCP_APPLY_ACTION_FORW;
-                ogs_assert(OGS_OK ==
-                    ogs_pfcp_ip_to_outer_header_creation(
-                            &sess->gnb_n3_ip,
-                            &dl_far->outer_header_creation,
-                            &dl_far->outer_header_creation_len));
-                dl_far->outer_header_creation.teid = sess->gnb_n3_teid;
-            } else {
-                ogs_error("%s:%d No QoS flow", smf_ue->supi, sess->psi);
-                smf_sbi_send_sm_context_update_error_log(
-                        stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                        "No QoS flow", smf_ue->supi);
-                goto cleanup;
+            dl_far->apply_action = OGS_PFCP_APPLY_ACTION_FORW;
+            ogs_assert(OGS_OK ==
+                ogs_pfcp_ip_to_outer_header_creation(
+                        &sess->remote_dl_ip,
+                        &dl_far->outer_header_creation,
+                        &dl_far->outer_header_creation_len));
+            dl_far->outer_header_creation.teid = sess->remote_dl_teid;
+        }
+    } else {
+        associatedQosFlowList =
+            &dLQosFlowPerTNLInformation->associatedQosFlowList;
+        for (i = 0; i < associatedQosFlowList->list.count; i++) {
+            NGAP_AssociatedQosFlowItem_t *associatedQosFlowItem = NULL;
+            associatedQosFlowItem = (NGAP_AssociatedQosFlowItem_t *)
+                    associatedQosFlowList->list.arrayi;
+
+            if (associatedQosFlowItem) {
+                qos_flow = smf_qos_flow_find_by_qfi(
+                        sess, associatedQosFlowItem->qosFlowIdentifier);
+
+                if (qos_flow) {
+                    ogs_pfcp_far_t *dl_far = qos_flow->dl_far;
+                    ogs_assert(dl_far);
+                    if (dl_far->apply_action != OGS_PFCP_APPLY_ACTION_FORW) {
+                        far_update = true;
+                    }
+
+                    dl_far->apply_action = OGS_PFCP_APPLY_ACTION_FORW;
+                    ogs_assert(OGS_OK ==
+                        ogs_pfcp_ip_to_outer_header_creation(
+                                &sess->remote_dl_ip,
+                                &dl_far->outer_header_creation,
+                                &dl_far->outer_header_creation_len));
+                    dl_far->outer_header_creation.teid = sess->remote_dl_teid;
+                }
             }
         }
     }
 
     if (far_update) {
+        uint64_t pfcp_flags = OGS_PFCP_MODIFY_DL_ONLY|OGS_PFCP_MODIFY_ACTIVATE;
+    /*
+     * UE-requested PDU Session Modification(ACTIVATED)
+     *
+     * 1.  V: OGS_PFCP_MODIFY_HOME_ROUTED_ROAMING|OGS_PFCP_MODIFY_DL_ONLY|
+     *        OGS_PFCP_MODIFY_OUTER_HEADER_REMOVAL|OGS_PFCP_MODIFY_ACTIVATE
+     * 2.  V*: if (sess->up_cnx_state == OpenAPI_up_cnx_state_ACTIVATING)
+     *            pfcp_flags |= OGS_PFCP_MODIFY_FROM_ACTIVATING;
+     * 3.  V: flags & OGS_PFCP_MODIFY_FROM_ACTIVATING ?
+     *           SMF_UPDATE_STATE_HR_ACTIVATED_FROM_ACTIVATING :
+     *           SMF_UPDATE_STATE_HR_ACTIVATED_FROM_NON_ACTIVATING,
+     * 4.  V: OpenAPI_request_indication_UE_REQ_PDU_SES_MOD
+     * 5.  V: smf_nsmf_pdusession_build_hsmf_update_data
+     * 6.  H: smf_nsmf_handle_update_data_in_hsmf
+     * 7.  H: OpenAPI_request_indication_UE_REQ_PDU_SES_MOD
+     * 8.  H: OGS_PFCP_MODIFY_HOME_ROUTED_ROAMING|OGS_PFCP_MODIFY_DL_ONLY|
+     *        OGS_PFCP_MODIFY_ACTIVATE
+     * 9.  H: ogs_sbi_send_http_status_no_content
+     * 10. V: case SMF_UPDATE_STATE_HR_ACTIVATED_FROM_ACTIVATING:
+     *           sess->up_cnx_state = OpenAPI_up_cnx_state_ACTIVATED;
+     *           smf_sbi_send_sm_context_updated_data_up_cnx_state(
+     *               OpenAPI_up_cnx_state_ACTIVATED);
+     *        case SMF_UPDATE_STATE_HR_ACTIVATED_FROM_NON_ACTIVATING:
+     *           ogs_sbi_send_http_status_no_content
+     */
+        if (HOME_ROUTED_ROAMING_IN_VSMF(sess)) {
+            pfcp_flags |= OGS_PFCP_MODIFY_HOME_ROUTED_ROAMING;
+            pfcp_flags |= OGS_PFCP_MODIFY_OUTER_HEADER_REMOVAL;
+
+            if (sess->up_cnx_state == OpenAPI_up_cnx_state_ACTIVATING)
+                pfcp_flags |= OGS_PFCP_MODIFY_FROM_ACTIVATING;
+        }
+
         ogs_assert(OGS_OK ==
             smf_5gc_pfcp_send_all_pdr_modification_request(
-                sess, stream, OGS_PFCP_MODIFY_DL_ONLY|OGS_PFCP_MODIFY_ACTIVATE,
-                0));
+                sess, stream, pfcp_flags, 0, 0));
     } else {
 #if 0 /* Modified by pull request #1729 */
         /* ACTIVATED Is NOT Included in RESPONSE */
         ogs_assert(true == ogs_sbi_send_http_status_no_content(stream));
 #else
-        if (sess->up_cnx_state == OpenAPI_up_cnx_state_ACTIVATING) {
-            sess->up_cnx_state = OpenAPI_up_cnx_state_ACTIVATED;
-            smf_sbi_send_sm_context_updated_data_up_cnx_state(
-                    sess, stream, OpenAPI_up_cnx_state_ACTIVATED);
+        if (HOME_ROUTED_ROAMING_IN_VSMF(sess)) {
+            sess->nsmf_param.request_indication =
+                OpenAPI_request_indication_UE_REQ_PDU_SES_MOD;
+
+            sess->nsmf_param.up_cnx_state = OpenAPI_up_cnx_state_ACTIVATED;
+
+            sess->nsmf_param.serving_network = true;
+
+            ogs_assert(OGS_OK ==
+                    ogs_sockaddr_to_ip(
+                        sess->local_dl_addr, sess->local_dl_addr6,
+                        &sess->nsmf_param.dl_ip));
+            sess->nsmf_param.dl_teid = sess->local_dl_teid;
+
+            sess->nsmf_param.an_type = sess->an_type;
+            sess->nsmf_param.rat_type = sess->sbi_rat_type;
+
+            r = smf_sbi_discover_and_send(
+                    OGS_SBI_SERVICE_TYPE_NSMF_PDUSESSION, NULL,
+                    smf_nsmf_pdusession_build_hsmf_update_data, sess, stream,
+                    sess->up_cnx_state == OpenAPI_up_cnx_state_ACTIVATING ?
+                        SMF_UPDATE_STATE_ACTIVATED_FROM_ACTIVATING :
+                        SMF_UPDATE_STATE_ACTIVATED_FROM_NON_ACTIVATING,
+                    NULL);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         } else {
-            ogs_assert(true == ogs_sbi_send_http_status_no_content(stream));
+            if (sess->up_cnx_state == OpenAPI_up_cnx_state_ACTIVATING) {
+                sess->up_cnx_state = OpenAPI_up_cnx_state_ACTIVATED;

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/npcf-build.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/npcf-build.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -165,12 +165,9 @@
         ogs_error("ueLocation.nr_location");
         goto end;
     }
-    ueLocation.nr_location->ue_location_timestamp =
-        ogs_sbi_gmtime_string(sess->ue_location_timestamp);
-    if (!ueLocation.nr_location->ue_location_timestamp) {
-        ogs_error("ueLocation.nr_location->ue_location_timestamp");
-        goto end;
-    }
+    if (sess->ue_location_timestamp)
+        ueLocation.nr_location->ue_location_timestamp =
+            ogs_sbi_gmtime_string(sess->ue_location_timestamp);
 
     SmPolicyContextData.user_location_info = &ueLocation;
 
@@ -327,8 +324,6 @@
 ogs_sbi_request_t *smf_npcf_smpolicycontrol_build_delete(
         smf_sess_t *sess, void *data)
 {
-    smf_npcf_smpolicycontrol_param_t *param = data;
-
     smf_ue_t *smf_ue = NULL;
 
     ogs_sbi_message_t message;
@@ -356,70 +351,69 @@
 
     memset(&ueLocation, 0, sizeof(ueLocation));
 
-    if (param) {
-        if (param->ran_nas_release.gmm_cause ||
-            param->ran_nas_release.gsm_cause ||
-            param->ran_nas_release.ngap_cause.group) {
-
-            ranNasRelCauseList = OpenAPI_list_create();
-            if (!ranNasRelCauseList) {
-                ogs_error("No ranNasRelCauseList");
-                goto end;
-            }
-
-            ranNasRelCause = ogs_calloc(1, sizeof(*ranNasRelCause));
-            if (!ranNasRelCause) {
-                ogs_error("No ranNasRelCause");
-                goto end;
-            }
+    if (sess->nsmf_param.gmm_cause ||
+        sess->nsmf_param.gsm_cause ||
+        sess->nsmf_param.ngap_cause.group) {
+
+        ranNasRelCauseList = OpenAPI_list_create();
+        if (!ranNasRelCauseList) {
+            ogs_error("No ranNasRelCauseList");
+            goto end;
+        }
 
-            if (param->ran_nas_release.ngap_cause.group) {
-                OpenAPI_ng_ap_cause_t *ngApCause = NULL;
+        ranNasRelCause = ogs_calloc(1, sizeof(*ranNasRelCause));
+        if (!ranNasRelCause) {
+            ogs_error("No ranNasRelCause");
+            goto end;
+        }
 
-                ranNasRelCause->ng_ap_cause = ngApCause =
-                    ogs_calloc(1, sizeof(*ngApCause));
-                if (!ranNasRelCause->ng_ap_cause) {
-                    ogs_error("No ranNasRelCause->ng_ap_cause");
-                    if (ranNasRelCause)
-                        ogs_free(ranNasRelCause);
-                    goto end;
-                }
+        if (sess->nsmf_param.ngap_cause.group) {
+            OpenAPI_ng_ap_cause_t *ngApCause = NULL;
 
-                ngApCause->group = param->ran_nas_release.ngap_cause.group;
-                ngApCause->value = param->ran_nas_release.ngap_cause.value;
+            ranNasRelCause->ng_ap_cause = ngApCause =
+                ogs_calloc(1, sizeof(*ngApCause));
+            if (!ranNasRelCause->ng_ap_cause) {
+                ogs_error("No ranNasRelCause->ng_ap_cause");
+                if (ranNasRelCause)
+                    ogs_free(ranNasRelCause);
+                goto end;
             }
 
+            ngApCause->group = sess->nsmf_param.ngap_cause.group;
+            ngApCause->value = sess->nsmf_param.ngap_cause.value;
+        }
+
+        if (sess->nsmf_param.gmm_cause) {
             ranNasRelCause->is__5g_mm_cause = true;
-            ranNasRelCause->_5g_mm_cause = param->ran_nas_release.gmm_cause;
+            ranNasRelCause->_5g_mm_cause = sess->nsmf_param.gmm_cause;
+        }
+        if (sess->nsmf_param.gsm_cause) {
             ranNasRelCause->is__5g_sm_cause = true;
-            ranNasRelCause->_5g_sm_cause = param->ran_nas_release.gsm_cause;
-
-            OpenAPI_list_add(ranNasRelCauseList, ranNasRelCause);
+            ranNasRelCause->_5g_sm_cause = sess->nsmf_param.gsm_cause;
         }
 
-        if (param->ue_location) {
-            ueLocation.nr_location = ogs_sbi_build_nr_location(
-                    &sess->nr_tai, &sess->nr_cgi);
-            if (!ueLocation.nr_location) {
-                ogs_error("ueLocation.nr_location");
-                goto end;
-            }
+        OpenAPI_list_add(ranNasRelCauseList, ranNasRelCause);
+    }
+
+    if (sess->nsmf_param.ue_location) {
+        ueLocation.nr_location = ogs_sbi_build_nr_location(
+                &sess->nr_tai, &sess->nr_cgi);
+        if (!ueLocation.nr_location) {
+            ogs_error("ueLocation.nr_location");
+            goto end;
+        }
+        if (sess->ue_location_timestamp)
             ueLocation.nr_location->ue_location_timestamp =
                 ogs_sbi_gmtime_string(sess->ue_location_timestamp);
-            if (!ueLocation.nr_location->ue_location_timestamp) {
-                ogs_error("ueLocation.nr_location->ue_location_timestamp");
-                goto end;
-            }
 
-            SmPolicyDeleteData.user_location_info = &ueLocation;
-        }
-        if (param->ue_timezone) {
-            SmPolicyDeleteData.ue_time_zone =
-                ogs_sbi_timezone_string(ogs_timezone());
-            if (!SmPolicyDeleteData.ue_time_zone) {
-                ogs_error("SmPolicyDeleteData.ue_time_zone");
-                goto end;
-            }
+        SmPolicyDeleteData.user_location_info = &ueLocation;
+    }
+    if (sess->nsmf_param.ue_timezone) {
+        SmPolicyDeleteData.ue_time_zone =
+            ogs_sbi_timezone_string(ogs_timezone());
+        if (!SmPolicyDeleteData.ue_time_zone) {
+            ogs_error("SmPolicyDeleteData.ue_time_zone");
+            goto end;
         }
     }

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/npcf-build.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/npcf-build.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/npcf-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/npcf-handler.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -20,6 +20,7 @@
 #include "sbi-path.h"
 #include "pfcp-path.h"
 #include "nas-path.h"
+#include "local-path.h"
 #include "binding.h"
 
 #include "npcf-handler.h"
@@ -272,7 +273,7 @@
 }
 
 bool smf_npcf_smpolicycontrol_handle_create(
-        smf_sess_t *sess, int state, ogs_sbi_message_t *recvmsg)
+        smf_sess_t *sess, ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
     int rv;
     char buf1OGS_ADDRSTRLEN;
@@ -284,6 +285,7 @@
     ogs_pfcp_pdr_t *ul_pdr = NULL;
     ogs_pfcp_pdr_t *cp2up_pdr = NULL;
     ogs_pfcp_pdr_t *up2cp_pdr = NULL;
+    ogs_pfcp_far_t *dl_far = NULL;
     ogs_pfcp_far_t *up2cp_far = NULL;
     ogs_pfcp_qer_t *qer = NULL;
 
@@ -518,6 +520,8 @@
     ogs_assert(up2cp_pdr);
 
     /* Setup FAR */
+    dl_far = qos_flow->dl_far;
+    ogs_assert(dl_far);
     up2cp_far = sess->up2cp_far;
     ogs_assert(up2cp_far);
 
@@ -588,6 +592,17 @@
         sess->ipv4 ? OGS_INET_NTOP(&sess->ipv4->addr, buf1) : "",
         sess->ipv6 ? OGS_INET6_NTOP(&sess->ipv6->addr, buf2) : "");
 
+    /* Set UPF N3 DL Outer-Header-Creation */
+    if (sess->remote_dl_ip.ipv4 || sess->remote_dl_ip.ipv6) {
+        ogs_assert(OGS_OK ==
+            ogs_pfcp_ip_to_outer_header_creation(
+                &sess->remote_dl_ip,
+                &dl_far->outer_header_creation,
+                &dl_far->outer_header_creation_len));
+        dl_far->outer_header_creation.teid = sess->remote_dl_teid;
+        dl_far->apply_action = OGS_PFCP_APPLY_ACTION_FORW;
+    }
+
     /* Set UE-to-CP Flow-Description and Outer-Header-Creation */
     up2cp_pdr->flowup2cp_pdr->num_of_flow.fd = 1;
     up2cp_pdr->flowup2cp_pdr->num_of_flow.description =
@@ -643,46 +658,46 @@
                 sess->session.name, ul_pdr->src_if);
         if (resource) {
             ogs_user_plane_ip_resource_info_to_sockaddr(&resource->info,
-                &sess->upf_n3_addr, &sess->upf_n3_addr6);
+                &sess->local_ul_addr, &sess->local_ul_addr6);
             if (resource->info.teidri)
-                sess->upf_n3_teid = OGS_PFCP_GTPU_INDEX_TO_TEID(
+                sess->local_ul_teid = OGS_PFCP_GTPU_INDEX_TO_TEID(
                         ul_pdr->teid, resource->info.teidri,
                         resource->info.teid_range);
             else
-                sess->upf_n3_teid = ul_pdr->teid;
+                sess->local_ul_teid = ul_pdr->teid;
         } else {
             ogs_assert(sess->pfcp_node->addr_list);
             if (sess->pfcp_node->addr_list->ogs_sa_family == AF_INET)
                 ogs_assert(OGS_OK ==
                     ogs_copyaddrinfo(
-                        &sess->upf_n3_addr, sess->pfcp_node->addr_list));
+                        &sess->local_ul_addr, sess->pfcp_node->addr_list));
             else if (sess->pfcp_node->addr_list->ogs_sa_family == AF_INET6)
                 ogs_assert(OGS_OK ==
                     ogs_copyaddrinfo(
-                        &sess->upf_n3_addr6, sess->pfcp_node->addr_list));
+                        &sess->local_ul_addr6, sess->pfcp_node->addr_list));
             else
                 ogs_assert_if_reached();
 
-            sess->upf_n3_teid = ul_pdr->teid;
+            sess->local_ul_teid = ul_pdr->teid;
         }
 
         ogs_assert(OGS_OK ==
             ogs_pfcp_sockaddr_to_f_teid(
-                sess->upf_n3_addr, sess->upf_n3_addr6,
+                sess->local_ul_addr, sess->local_ul_addr6,
                 &ul_pdr->f_teid, &ul_pdr->f_teid_len));
-        ul_pdr->f_teid.teid = sess->upf_n3_teid;
+        ul_pdr->f_teid.teid = sess->local_ul_teid;
 
         ogs_assert(OGS_OK ==
             ogs_pfcp_sockaddr_to_f_teid(
-                sess->upf_n3_addr, sess->upf_n3_addr6,
+                sess->local_ul_addr, sess->local_ul_addr6,
                 &cp2up_pdr->f_teid, &cp2up_pdr->f_teid_len));
         cp2up_pdr->f_teid.teid = cp2up_pdr->teid;
 
         ogs_assert(OGS_OK ==
             ogs_pfcp_sockaddr_to_f_teid(
-                sess->upf_n3_addr, sess->upf_n3_addr6,
+                sess->local_ul_addr, sess->local_ul_addr6,
                 &up2cp_pdr->f_teid, &up2cp_pdr->f_teid_len));
-        up2cp_pdr->f_teid.teid = sess->upf_n3_teid;
+        up2cp_pdr->f_teid.teid = sess->local_ul_teid;
     }
 
     dl_pdr->precedence = OGS_PFCP_DEFAULT_PDR_PRECEDENCE;
@@ -692,7 +707,7 @@
     up2cp_pdr->precedence = OGS_PFCP_UP2CP_PDR_PRECEDENCE;
 
     ogs_assert(OGS_OK ==
-            smf_5gc_pfcp_send_session_establishment_request(sess, 0));
+            smf_5gc_pfcp_send_session_establishment_request(sess, stream, 0));
 
     return true;
 }
@@ -752,8 +767,6 @@
         smf_sess_t *sess, ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
     smf_ue_t *smf_ue = NULL;
-    smf_npcf_smpolicycontrol_param_t param;
-    int r;
 
     ogs_assert(sess);
     ogs_assert(stream);
@@ -764,19 +777,8 @@
 
     ogs_assert(true == ogs_sbi_send_http_status_no_content(stream));
 
-    if (PCF_SM_POLICY_ASSOCIATED(sess)) {
-        memset(&param, 0, sizeof(param));
-        r = smf_sbi_discover_and_send(
-                OGS_SBI_SERVICE_TYPE_NPCF_SMPOLICYCONTROL, NULL,
-                smf_npcf_smpolicycontrol_build_delete,
-                sess, NULL, OGS_PFCP_DELETE_TRIGGER_PCF_INITIATED, &param);
-        ogs_expect(r == OGS_OK);
-        ogs_assert(r != OGS_ERROR);
-    } else {
-        ogs_error("%s:%d No PolicyAssociationId. Forcibly remove SESSION",
-                smf_ue->supi, sess->psi);
-        SMF_SESS_CLEAR(sess);
-    }
+    smf_trigger_session_release(
+            sess, NULL, OGS_PFCP_DELETE_TRIGGER_PCF_INITIATED);
 
     return true;
 }

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/npcf-handler.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/npcf-handler.h Changed

open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/nsmf-build.c Added

@@ -0,0 +1,881 @@
+/*
+ * Copyright (C) 2024-2025 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 "nsmf-build.h"
+#include "gsm-build.h"
+
+ogs_sbi_request_t *smf_nsmf_pdusession_build_create_data(
+        smf_sess_t *sess, void *data)
+{
+    ogs_sbi_message_t message;
+    ogs_sbi_request_t *request = NULL;
+
+    ogs_sbi_server_t *server = NULL;
+    ogs_sbi_header_t header;
+
+    smf_ue_t *smf_ue = NULL;
+
+    OpenAPI_pdu_session_create_data_t PduSessionCreateData;
+    OpenAPI_snssai_t sNssai;
+    OpenAPI_snssai_t hplmnSnssai;
+    OpenAPI_tunnel_info_t vcnTunnelInfo;
+    OpenAPI_ref_to_binary_data_t n1SmInfoFromUe;
+    OpenAPI_user_location_t ueLocation;
+
+#if 0 /* Needs to be checked against AMF's nsmf-build.c */
+    ogs_sbi_nf_instance_t *pcf_nf_instance = NULL;
+#endif
+
+    int rv;
+    ogs_nas_5gs_message_t nas_message;
+    ogs_nas_5gs_pdu_session_establishment_request_t
+        *pdu_session_establishment_request = NULL;
+    ogs_nas_integrity_protection_maximum_data_rate_t
+        *integrity_protection_maximum_data_rate = NULL;
+    ogs_pkbuf_t *n1SmBufFromUe = NULL;
+
+    ogs_assert(sess);
+    smf_ue = smf_ue_find_by_id(sess->smf_ue_id);
+    ogs_assert(smf_ue);
+
+    memset(&message, 0, sizeof(message));
+    message.h.method = (char *)OGS_SBI_HTTP_METHOD_POST;
+    ogs_assert(sess->h_smf_uri);
+    message.h.uri = sess->h_smf_uri;
+
+    memset(&header, 0, sizeof(header));
+    memset(&PduSessionCreateData, 0, sizeof(PduSessionCreateData));
+    memset(&sNssai, 0, sizeof(sNssai));
+    memset(&hplmnSnssai, 0, sizeof(hplmnSnssai));
+    memset(&vcnTunnelInfo, 0, sizeof(vcnTunnelInfo));
+    memset(&ueLocation, 0, sizeof(ueLocation));
+
+    PduSessionCreateData.supi = smf_ue->supi;
+    if (smf_ue->imeisv_len) {
+        PduSessionCreateData.pei = ogs_msprintf("%s-%s",
+                OGS_ID_SUPI_TYPE_IMEISV, smf_ue->imeisv_bcd);
+    }
+    if (smf_ue->msisdn_len) {
+        PduSessionCreateData.gpsi = ogs_msprintf("%s-%s",
+                OGS_ID_GPSI_TYPE_MSISDN, smf_ue->msisdn_bcd);
+    }
+    PduSessionCreateData.is_pdu_session_id = true;
+    PduSessionCreateData.pdu_session_id = sess->psi;
+    if (!PduSessionCreateData.pdu_session_id) {
+        ogs_error("No pdu_session_id");
+        goto end;
+    }
+
+    /*
+     * TS29.502
+     * 6.1 Nsmf_PDUSession Service API
+     * Table 6.1.6.2.2-1: Definition of type PduSessionCreateData
+     *
+     * NAME: dnn
+     * Data type: Dnn
+     * P: C
+     * Cardinality: 0..1
+     *
+     * This IE shall be present, except during an EPS to 5GS Idle mode mobility
+     * or handover using the N26 interface.
+     *
+     * When present, it shall contain the requested DNN; the DNN shall
+     * be the full DNN (i.e. with both the Network Identifier and
+     * Operator Identifier) for a HR PDU session, and it should be
+     * the full DNN in LBO and non-roaming scenarios. If the Operator Identifier
+     * is absent, the serving core network operator shall be assumed.
+     */
+    PduSessionCreateData.dnn = ogs_strdup(sess->full_dnn);
+    ogs_assert(PduSessionCreateData.dnn);
+
+    sNssai.sst = sess->s_nssai.sst;
+    sNssai.sd = ogs_s_nssai_sd_to_string(sess->s_nssai.sd);
+    PduSessionCreateData.s_nssai = &sNssai;
+
+    if (sess->mapped_hplmn.sst) {
+        hplmnSnssai.sst = sess->mapped_hplmn.sst;
+        hplmnSnssai.sd = ogs_s_nssai_sd_to_string(sess->mapped_hplmn.sd);
+        PduSessionCreateData.hplmn_snssai = &hplmnSnssai;
+    }
+
+    PduSessionCreateData.vsmf_id = NF_INSTANCE_ID(ogs_sbi_self()->nf_instance);
+    if (!PduSessionCreateData.vsmf_id) {
+        ogs_error("No vsmfId");
+        goto end;
+    }
+
+    PduSessionCreateData.serving_network =
+        ogs_sbi_build_plmn_id_nid(&sess->nr_tai.plmn_id);
+    if (!PduSessionCreateData.serving_network) {
+        ogs_error("No serving_network");
+        goto end;
+    }
+
+    if (sess->request_type >= OpenAPI_request_type_INITIAL_REQUEST &&
+            sess->request_type <=
+            OpenAPI_request_type_EXISTING_EMERGENCY_PDU_SESSION)
+        PduSessionCreateData.request_type = sess->request_type;
+
+    header.service.name = (char *)OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION;
+    header.api.version = (char *)OGS_SBI_API_V1;
+    header.resource.component0 =
+        (char *)OGS_SBI_RESOURCE_NAME_VSMF_PDU_SESSIONS;
+    header.resource.component1 = sess->sm_context_ref;
+    if (!header.resource.component1) {
+        ogs_error("No header.resource.component1");
+        goto end;
+    }
+
+    server = ogs_sbi_server_first();
+    if (!server) {
+        ogs_error("No server");
+        goto end;
+    }
+    PduSessionCreateData.vsmf_pdu_session_uri =
+        ogs_sbi_server_uri(server, &header);
+
+    if (sess->local_dl_addr)
+        vcnTunnelInfo.ipv4_addr = ogs_ipstrdup(sess->local_dl_addr);
+    if (sess->local_dl_addr6)
+        vcnTunnelInfo.ipv6_addr = ogs_ipstrdup(sess->local_dl_addr6);
+    vcnTunnelInfo.gtp_teid = ogs_uint32_to_0string(sess->local_dl_teid);
+    PduSessionCreateData.vcn_tunnel_info = &vcnTunnelInfo;
+
+    PduSessionCreateData.an_type = sess->an_type;
+    PduSessionCreateData.rat_type = sess->sbi_rat_type;
+
+    ueLocation.nr_location = ogs_sbi_build_nr_location(
+            &sess->nr_tai, &sess->nr_cgi);
+    if (!ueLocation.nr_location) {
+        ogs_error("No ueLocation.nr_location");
+        goto end;
+    }
+    if (sess->ue_location_timestamp)
+        ueLocation.nr_location->ue_location_timestamp =
+            ogs_sbi_gmtime_string(sess->ue_location_timestamp);
+
+    PduSessionCreateData.ue_location = &ueLocation;
+    PduSessionCreateData.ue_time_zone = ogs_sbi_timezone_string(ogs_timezone());
+    if (!PduSessionCreateData.ue_time_zone) {
+        ogs_error("No ue_time_zone");
+        goto end;
+    }
+
+    /*
+     * We're experiencing an issue after changing SearchResult.validityTime
+     * from 3600 seconds to 30 seconds. (#3210)
+     *
+     * When AMF finds a PCF through Discovery, it can be deleted
+     * after 30 seconds by ValidityTime.
+     *
+     * We have changed our implementation to not send the PCF-ID in this case.
+     *
+     * What we need to do is proactively add a part that will re-discover
+     * the PCF when a situation arises where we really need the PCF-ID.
+     */
+#if 0 /* Needs to be checked against AMF's nsmf-build.c */
+    pcf_nf_instance = OGS_SBI_GET_NF_INSTANCE(
+            amf_ue->sbi.service_type_array
+            OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL);
+    if (pcf_nf_instance)
+        PduSessionCreateData.pcf_id = pcf_nf_instance->id;
+    else
+        ogs_error("No pcf_nf_instance");

open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/nsmf-build.h Added

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2024-2025 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/>.
+ */
+
+#ifndef SMF_NSMF_BUILD_H
+#define SMF_NSMF_BUILD_H
+
+#include "context.h"
+#include "gsmue-message.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ogs_sbi_request_t *smf_nsmf_pdusession_build_create_data(
+        smf_sess_t *sess, void *data);
+ogs_sbi_request_t *smf_nsmf_pdusession_build_hsmf_update_data(
+        smf_sess_t *sess, void *data);
+ogs_sbi_request_t *smf_nsmf_pdusession_build_vsmf_update_data(
+        smf_sess_t *sess, void *data);
+ogs_sbi_request_t *smf_nsmf_pdusession_build_release_data(
+        smf_sess_t *sess, void *data);
+
+ogs_sbi_request_t *smf_nsmf_pdusession_build_status(
+        smf_sess_t *sess, void *data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SMF_NSMF_BUILD_H */

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/nsmf-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/nsmf-handler.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -21,6 +21,8 @@
 #include "nas-path.h"
 #include "ngap-path.h"
 #include "pfcp-path.h"
+#include "local-path.h"
+#include "gsm-handler.h"
 #include "nsmf-handler.h"
 
 bool smf_nsmf_handle_create_sm_context(
@@ -28,6 +30,9 @@
 {
     bool rc;
     smf_ue_t *smf_ue = NULL;
+    smf_bearer_t *qos_flow = NULL;
+    ogs_pfcp_pdr_t *dl_pdr = NULL;
+    ogs_pfcp_pdr_t *ul_pdr = NULL;
     char *type = NULL;
 
     ogs_nas_5gsm_header_t *gsm_header = NULL;
@@ -38,6 +43,7 @@
     char *fqdn = NULL;
     uint16_t fqdn_port = 0;
     ogs_sockaddr_t *addr = NULL, *addr6 = NULL;
+    char *home_network_domain = NULL;
 
     OpenAPI_sm_context_create_data_t *SmContextCreateData = NULL;
     OpenAPI_nr_location_t *NrLocation = NULL;
@@ -94,6 +100,16 @@
 
     }
 
+    if (!SmContextCreateData->dnn) {
+        ogs_error("%s:%d No DNN", smf_ue->supi, sess->psi);
+        n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
+            OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        smf_sbi_send_sm_context_create_error(stream,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
+                "No DNN", smf_ue->supi, n1smbuf);
+        return false;
+    }
+
     sNssai = SmContextCreateData->s_nssai;
     if (!sNssai) {
         ogs_error("%s:%d No sNssai", smf_ue->supi, sess->psi);
@@ -105,10 +121,29 @@
         return false;
     }
 
+    if (!SmContextCreateData->serving_nf_id) {
+        ogs_error("%s:%d No Serving AMF NF-ID", smf_ue->supi, sess->psi);
+        n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
+            OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        smf_sbi_send_sm_context_create_error(stream,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
+                "No Serving AMF NF-ID", smf_ue->supi, n1smbuf);
+        return false;
+    }
+
+    if (!SmContextCreateData->guami) {
+        ogs_error("%s:%d No Guami", smf_ue->supi, sess->psi);
+        n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
+            OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        smf_sbi_send_sm_context_create_error(stream,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
+                "No Guami", smf_ue->supi, n1smbuf);
+        return false;
+    }
+
     servingNetwork = SmContextCreateData->serving_network;
     if (!servingNetwork || !servingNetwork->mnc || !servingNetwork->mcc) {
-        ogs_error("%s:%d No servingNetwork",
-                smf_ue->supi, sess->psi);
+        ogs_error("%s:%d No servingNetwork", smf_ue->supi, sess->psi);
         n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
             OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
         smf_sbi_send_sm_context_create_error(stream,
@@ -117,6 +152,26 @@
         return false;
     }
 
+    if (!SmContextCreateData->an_type) {
+        ogs_error("%s:%d No anType", smf_ue->supi, sess->psi);
+        n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
+            OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        smf_sbi_send_sm_context_create_error(stream,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
+                "No anType", smf_ue->supi, n1smbuf);
+        return false;
+    }
+
+    if (!SmContextCreateData->rat_type) {
+        ogs_error("%s:%d No ratType", smf_ue->supi, sess->psi);
+        n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
+            OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        smf_sbi_send_sm_context_create_error(stream,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST, OGS_SBI_APP_ERRNO_NULL,
+                "No ratType", smf_ue->supi, n1smbuf);
+        return false;
+    }
+
     if (!SmContextCreateData->ue_location ||
         !SmContextCreateData->ue_location->nr_location) {
         ogs_error("%s:%d No UeLocation", smf_ue->supi, sess->psi);
@@ -226,10 +281,12 @@
         smf_ue->gpsi = ogs_strdup(SmContextCreateData->gpsi);
     }
 
-    /* Serving PLMN & Home PLMN */
+    sess->request_type = SmContextCreateData->request_type;
+
     ogs_sbi_parse_plmn_id_nid(&sess->serving_plmn_id, servingNetwork);
     memcpy(&sess->home_plmn_id, &sess->serving_plmn_id, OGS_PLMN_ID_LEN);
 
+    sess->an_type = SmContextCreateData->an_type;
     sess->sbi_rat_type = SmContextCreateData->rat_type;
 
     ogs_sbi_parse_nr_location(&sess->nr_tai, &sess->nr_cgi, NrLocation);
@@ -296,66 +353,72 @@
      * the full DNN in LBO and non-roaming scenarios. If the Operator Identifier
      * is absent, the serving core network operator shall be assumed.
      */
-    if (SmContextCreateData->dnn) {
-        char *home_network_domain =
-            ogs_home_network_domain_from_fqdn(SmContextCreateData->dnn);
-
-        if (home_network_domain) {
-            char dnn_network_identiferOGS_MAX_DNN_LEN+1;
-            uint16_t mcc = 0, mnc = 0;
-
-            ogs_assert(home_network_domain > SmContextCreateData->dnn);
-
-            ogs_cpystrn(dnn_network_identifer, SmContextCreateData->dnn,
-                ogs_min(OGS_MAX_DNN_LEN,
-                    home_network_domain - SmContextCreateData->dnn));
-
-            if (sess->session.name)
-                ogs_free(sess->session.name);
-            sess->session.name = ogs_strdup(dnn_network_identifer);
-            ogs_assert(sess->session.name);
-
-            if (sess->full_dnn)
-                ogs_free(sess->full_dnn);
-            sess->full_dnn = ogs_strdup(SmContextCreateData->dnn);
-            ogs_assert(sess->full_dnn);
+    home_network_domain =
+        ogs_home_network_domain_from_fqdn(SmContextCreateData->dnn);
 
-            mcc = ogs_plmn_id_mcc_from_fqdn(sess->full_dnn);
-            mnc = ogs_plmn_id_mnc_from_fqdn(sess->full_dnn);
+    if (home_network_domain) {
+        char dnn_network_identiferOGS_MAX_DNN_LEN+1;
+        uint16_t mcc = 0, mnc = 0;
+
+        ogs_assert(home_network_domain > SmContextCreateData->dnn);
+
+        ogs_cpystrn(dnn_network_identifer, SmContextCreateData->dnn,
+            ogs_min(OGS_MAX_DNN_LEN,
+                home_network_domain - SmContextCreateData->dnn));
+
+        if (sess->session.name)
+            ogs_free(sess->session.name);
+        sess->session.name = ogs_strdup(dnn_network_identifer);
+        ogs_assert(sess->session.name);
+
+        if (sess->full_dnn)
+            ogs_free(sess->full_dnn);
+        sess->full_dnn = ogs_strdup(SmContextCreateData->dnn);
+        ogs_assert(sess->full_dnn);
 
-            /*
-             * To generate the Home PLMN ID of the SMF-UE,
-             * the length of the MNC is obtained
-             * by comparing the MNC part of the SUPI and full-DNN.
-             */
-            if (mcc && mnc &&
-                strncmp(smf_ue->supi, "imsi-", strlen("imsi-")) == 0) {
-                int mnc_len = 0;
-                char bufOGS_PLMNIDSTRLEN;
-
-                ogs_snprintf(buf, OGS_PLMNIDSTRLEN, "%03d%02d", mcc, mnc);
-                if (strncmp(smf_ue->supi + 5, buf, strlen(buf)) == 0)
-                    mnc_len = 2;
-
-                ogs_snprintf(buf, OGS_PLMNIDSTRLEN, "%03d%03d", mcc, mnc);
-                if (strncmp(smf_ue->supi + 5, buf, strlen(buf)) == 0)
-                    mnc_len = 3;
-
-                /* Change Home PLMN for VPLMN */
-                if (mnc_len == 2 || mnc_len == 3)
-                    ogs_plmn_id_build(&sess->home_plmn_id, mcc, mnc, mnc_len);
-            }
-        } else {
-            if (sess->session.name)

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/nsmf-handler.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/nsmf-handler.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -33,6 +33,19 @@
 bool smf_nsmf_handle_release_sm_context(
     smf_sess_t *sess, ogs_sbi_stream_t *stream, ogs_sbi_message_t *message);
 
+bool smf_nsmf_handle_create_data_in_hsmf(
+    smf_sess_t *sess, ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg);
+bool smf_nsmf_handle_created_data_in_vsmf(
+    smf_sess_t *sess, ogs_sbi_message_t *recvmsg);
+
+bool smf_nsmf_handle_update_data_in_hsmf(
+    smf_sess_t *sess, ogs_sbi_stream_t *stream, ogs_sbi_message_t *message);
+bool smf_nsmf_handle_update_data_in_vsmf(
+    smf_sess_t *sess, ogs_sbi_stream_t *stream, ogs_sbi_message_t *message);
+
+bool smf_nsmf_handle_release_data_in_hsmf(
+    smf_sess_t *sess, ogs_sbi_stream_t *stream, ogs_sbi_message_t *message);
+
 bool smf_nsmf_callback_handle_sdm_data_change_notify(
     ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/nudm-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/nudm-handler.c Changed

@@ -50,7 +50,6 @@
     ogs_assert(smf_ue);
     ogs_assert(recvmsg);
 
-
     if ((!recvmsg->SessionManagementSubscriptionDataList) ||
         (recvmsg->SessionManagementSubscriptionDataList->count == 0))
     {
@@ -389,12 +388,8 @@
     char *strerror = NULL;
     smf_ue_t *smf_ue;
 
-    ogs_sbi_server_t *server = NULL;
     ogs_sbi_header_t header;
-    ogs_sbi_message_t sendmsg;
     ogs_sbi_message_t message;
-    ogs_sbi_response_t *response = NULL;
-    OpenAPI_sm_context_created_data_t SmContextCreatedData;
 
     bool rc;
     ogs_sbi_client_t *client = NULL;
@@ -470,35 +465,11 @@
 
 
     /*********************************************************************
+     * If NOT Home-Routed Roaming,
      * Send HTTP_STATUS_CREATED(/nsmf-pdusession/v1/sm-context) to the AMF
      *********************************************************************/
-
-    memset(&SmContextCreatedData, 0, sizeof(SmContextCreatedData));
-    memset(&sendmsg, 0, sizeof(sendmsg));
-    memset(&header, 0, sizeof(header));
-
-    header.service.name = (char *)OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION;
-    header.api.version = (char *)OGS_SBI_API_V1;
-    header.resource.component0 =
-        (char *)OGS_SBI_RESOURCE_NAME_SM_CONTEXTS;
-    header.resource.component1 = sess->sm_context_ref;
-
-    server = ogs_sbi_server_from_stream(stream);
-    ogs_assert(server);
-
-    sendmsg.http.location = ogs_sbi_server_uri(server, &header);
-    ogs_assert(sendmsg.http.location);
-
-    sendmsg.SmContextCreatedData = &SmContextCreatedData;
-
-    response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_CREATED);
-    ogs_assert(response);
-    ogs_assert(true == ogs_sbi_server_send_response(stream, response));
-
-    smf_metrics_inst_by_slice_add(&sess->serving_plmn_id, &sess->s_nssai,
-            SMF_METR_CTR_SM_PDUSESSIONCREATIONSUCC, 1);
-
-    ogs_free(sendmsg.http.location);
+    if (!HOME_ROUTED_ROAMING_IN_HSMF(sess))
+        smf_sbi_send_sm_context_created_data(sess, stream);
 
     r = smf_sbi_discover_and_send(
             OGS_SBI_SERVICE_TYPE_NPCF_SMPOLICYCONTROL, NULL,

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/pfcp-path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/pfcp-path.c Changed

@@ -372,6 +372,58 @@
     }
 }
 
+static void qos_flow_5gc_timeout(ogs_pfcp_xact_t *xact, void *data)
+{
+    ogs_pool_id_t qos_flow_id = OGS_INVALID_POOL_ID;
+    smf_ue_t *smf_ue = NULL;
+    smf_sess_t *sess = NULL;
+    smf_bearer_t *qos_flow = NULL;
+    ogs_sbi_stream_t *stream = NULL;
+    char *strerror = NULL;
+    uint8_t type;
+
+    ogs_assert(xact);
+    ogs_assert(data);
+
+    if (xact->assoc_stream_id >= OGS_MIN_POOL_ID &&
+            xact->assoc_stream_id <= OGS_MAX_POOL_ID)
+        stream = ogs_sbi_stream_find_by_id(xact->assoc_stream_id);
+
+    type = xact->seq0.type;
+
+    qos_flow_id = OGS_POINTER_TO_UINT(data);
+    ogs_assert(qos_flow_id >= OGS_MIN_POOL_ID &&
+            qos_flow_id <= OGS_MAX_POOL_ID);
+
+    qos_flow = smf_qos_flow_find_by_id(qos_flow_id);
+    if (!qos_flow) {
+        ogs_error("QoS Flow has already been removed %d", type);
+        return;
+    }
+    sess = smf_sess_find_by_id(qos_flow->sess_id);
+    ogs_assert(sess);
+    smf_ue = smf_ue_find_by_id(sess->smf_ue_id);
+    ogs_assert(smf_ue);
+
+    switch (type) {
+    case OGS_PFCP_SESSION_MODIFICATION_REQUEST_TYPE:
+        strerror = ogs_msprintf("%s:%d No PFCP session modification response",
+                smf_ue->supi, sess->psi);
+        ogs_assert(strerror);
+
+        ogs_error("%s", strerror);
+        if (stream) {
+            smf_sbi_send_sm_context_update_error_log(
+                stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, strerror, NULL);
+        }
+        ogs_free(strerror);
+        break;
+    default:
+        ogs_error("Not implemented type:%d", type);
+        break;
+    }
+}
+
 static void sess_epc_timeout(ogs_pfcp_xact_t *xact, void *data)
 {
     smf_sess_t *sess = NULL;
@@ -480,7 +532,7 @@
 }
 
 int smf_5gc_pfcp_send_session_establishment_request(
-        smf_sess_t *sess, uint64_t flags)
+        smf_sess_t *sess, ogs_sbi_stream_t *stream, uint64_t flags)
 {
     int rv;
     ogs_pkbuf_t *n4buf = NULL;
@@ -496,6 +548,12 @@
         return OGS_ERROR;
     }
 
+    if (stream) {
+        xact->assoc_stream_id = ogs_sbi_id_from_stream(stream);
+        ogs_assert(xact->assoc_stream_id >= OGS_MIN_POOL_ID &&
+                xact->assoc_stream_id <= OGS_MAX_POOL_ID);
+    }
+
     xact->local_seid = sess->smf_n4_seid;
     xact->create_flags = flags;
 
@@ -553,7 +611,7 @@
 
 int smf_5gc_pfcp_send_all_pdr_modification_request(
         smf_sess_t *sess, ogs_sbi_stream_t *stream,
-        uint64_t flags, ogs_time_t duration)
+        uint64_t flags, int trigger, ogs_time_t duration)
 {
     int rv;
     ogs_pfcp_xact_t *xact = NULL;
@@ -578,6 +636,7 @@
 
     xact->local_seid = sess->smf_n4_seid;
     xact->modify_flags = flags | OGS_PFCP_MODIFY_SESSION;
+    xact->delete_trigger = trigger;
 
     ogs_list_init(&sess->pdr_to_modify_list);
     ogs_list_for_each(&sess->pfcp.pdr_list, pdr)
@@ -617,6 +676,45 @@
 
     rv = smf_pfcp_send_modify_list(
             sess, smf_n4_build_qos_flow_to_modify_list, xact, duration);
+    ogs_expect(rv == OGS_OK);
+
+    return rv;
+}
+
+int smf_5gc_pfcp_send_one_qos_flow_modification_request(
+        smf_bearer_t *qos_flow, ogs_sbi_stream_t *stream,
+        uint64_t flags, ogs_time_t duration)
+{
+    int rv;
+    ogs_pfcp_xact_t *xact = NULL;
+    smf_sess_t *sess = NULL;
+
+    ogs_assert(qos_flow);
+    sess = smf_sess_find_by_id(qos_flow->id);
+    ogs_assert(sess);
+
+    xact = ogs_pfcp_xact_local_create(
+            sess->pfcp_node, qos_flow_5gc_timeout,
+            OGS_UINT_TO_POINTER(qos_flow->id));
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
+
+    if (stream) {
+        xact->assoc_stream_id = ogs_sbi_id_from_stream(stream);
+        ogs_assert(xact->assoc_stream_id >= OGS_MIN_POOL_ID &&
+                xact->assoc_stream_id <= OGS_MAX_POOL_ID);
+    }
+
+    xact->local_seid = sess->smf_n4_seid;
+    xact->modify_flags = flags;
+
+    ogs_list_init(&sess->qos_flow_to_modify_list);
+    ogs_list_add(&sess->qos_flow_to_modify_list, &qos_flow->to_modify_node);
+
+    rv = smf_pfcp_send_modify_list(
+            sess, smf_n4_build_qos_flow_to_modify_list, xact, duration);
     ogs_expect(rv == OGS_OK);
 
     return rv;

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/pfcp-path.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/pfcp-path.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -36,13 +36,16 @@
         ogs_pfcp_xact_t *xact, ogs_time_t duration);
 
 int smf_5gc_pfcp_send_session_establishment_request(
-        smf_sess_t *sess, uint64_t flags);
+        smf_sess_t *sess, ogs_sbi_stream_t *stream, uint64_t flags);
 int smf_5gc_pfcp_send_all_pdr_modification_request(
         smf_sess_t *sess, ogs_sbi_stream_t *stream,
-        uint64_t flags, ogs_time_t duration);
+        uint64_t flags, int trigger, ogs_time_t duration);
 int smf_5gc_pfcp_send_qos_flow_list_modification_request(
         smf_sess_t *sess, ogs_sbi_stream_t *stream,
         uint64_t flags, ogs_time_t duration);
+int smf_5gc_pfcp_send_one_qos_flow_modification_request(
+        smf_bearer_t *qos_flow, ogs_sbi_stream_t *stream,
+        uint64_t flags, ogs_time_t duration);
 int smf_5gc_pfcp_send_session_deletion_request(
         smf_sess_t *sess, ogs_sbi_stream_t *stream, int trigger);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/pfcp-sm.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/pfcp-sm.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -19,6 +19,7 @@
 
 #include "sbi-path.h"
 #include "pfcp-path.h"
+#include "local-path.h"
 
 #include "n4-handler.h"
 
@@ -480,7 +481,8 @@
                             OGS_INET6_NTOP(&sess->ipv6->addr, buf2) : "");
                     ogs_assert(OGS_OK ==
                             smf_5gc_pfcp_send_session_establishment_request(
-                                sess, OGS_PFCP_CREATE_RESTORATION_INDICATION));
+                                sess, NULL,
+                                OGS_PFCP_CREATE_RESTORATION_INDICATION));
                 }
             }
         }
@@ -489,7 +491,6 @@
 
 static void reselect_upf(ogs_pfcp_node_t *node)
 {
-    int r;
     smf_ue_t *smf_ue = NULL;
     ogs_pfcp_node_t *iter = NULL;
 
@@ -522,27 +523,9 @@
                     ogs_error("%s:%s EPC restoration is not implemented",
                             smf_ue->imsi_bcd, sess->session.name);
                 } else {
-                    if (PCF_SM_POLICY_ASSOCIATED(sess)) {
-                        smf_npcf_smpolicycontrol_param_t param;
-
-                        ogs_info("%s:%d SMF-initiated Deletion",
-                                smf_ue->supi, sess->psi);
-                        ogs_assert(sess->sm_context_ref);
-                        memset(&param, 0, sizeof(param));
-                        r = smf_sbi_discover_and_send(
-                                OGS_SBI_SERVICE_TYPE_NPCF_SMPOLICYCONTROL, NULL,
-                                smf_npcf_smpolicycontrol_build_delete,
-                                sess, NULL,
-                                OGS_PFCP_DELETE_TRIGGER_SMF_INITIATED,
-                                &param);
-                        ogs_expect(r == OGS_OK);
-                        ogs_assert(r != OGS_ERROR);
-                    } else {
-                        ogs_error("%s:%d No PolicyAssociationId. "
-                                "Forcibly remove SESSION",
-                                smf_ue->supi, sess->psi);
-                        SMF_SESS_CLEAR(sess);
-                    }
+                    smf_trigger_session_release(
+                            sess, NULL,
+                            OGS_PFCP_DELETE_TRIGGER_SMF_INITIATED);
                 }
             }
         }

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/s5c-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/s5c-handler.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/sbi-path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/sbi-path.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -44,6 +44,7 @@
     ogs_sbi_nf_instance_build_default(nf_instance);
     ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SCP);
     ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AMF);
+    ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SMF);
 
     /* Build NF service information. It will be transmitted to NRF. */
     if (ogs_sbi_nf_service_is_available(OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION)) {
@@ -53,6 +54,7 @@
         ogs_sbi_nf_service_add_version(
                     service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL);
         ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF);
+        ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_SMF);
     }
 
     /* Initialize NRF NF Instance */
@@ -234,13 +236,13 @@
     return OGS_OK;
 }
 
-void smf_namf_comm_send_n1_n2_message_transfer(
-        smf_sess_t *sess, smf_n1_n2_message_transfer_param_t *param)
+ogs_sbi_xact_t *smf_namf_comm_create_n1_n2_message_xact(
+        smf_sess_t *sess, ogs_sbi_stream_t *stream,
+        smf_n1_n2_message_transfer_param_t *param)
 {
     smf_ue_t *smf_ue = NULL;
     ogs_sbi_xact_t *xact = NULL;
     ogs_sbi_discovery_option_t *discovery_option = NULL;
-    int r;
 
     ogs_assert(sess);
     smf_ue = smf_ue_find_by_id(sess->smf_ue_id);
@@ -253,7 +255,7 @@
     discovery_option = ogs_sbi_discovery_option_new();
     ogs_assert(discovery_option);
     ogs_sbi_discovery_option_set_target_nf_instance_id(
-            discovery_option, sess->serving_nf_id);
+            discovery_option, sess->amf_nf_id);
 
     xact = ogs_sbi_xact_add(
             sess->id, &sess->sbi, OGS_SBI_SERVICE_TYPE_NAMF_COMM,
@@ -261,12 +263,39 @@
             (ogs_sbi_build_f)smf_namf_comm_build_n1_n2_message_transfer,
             sess, param);
     if (!xact) {
-        ogs_error("smf_namf_comm_send_n1_n2_message_transfer() failed");
-        return;
+        ogs_error("ogs_sbi_xact_add() failed");
+        return NULL;
     }
 
     xact->state = param->state;
 
+    if (stream) {
+        xact->assoc_stream_id = ogs_sbi_id_from_stream(stream);
+        ogs_assert(xact->assoc_stream_id >= OGS_MIN_POOL_ID &&
+                xact->assoc_stream_id <= OGS_MAX_POOL_ID);
+    }
+
+    return xact;
+}
+
+void smf_namf_comm_send_n1_n2_message_transfer(
+        smf_sess_t *sess, ogs_sbi_stream_t *stream,
+        smf_n1_n2_message_transfer_param_t *param)
+{
+    ogs_sbi_xact_t *xact = NULL;
+    int r;
+
+    ogs_assert(sess);
+    ogs_assert(param);
+    ogs_assert(param->state);
+    ogs_assert(param->n1smbuf || param->n2smbuf);
+
+    xact = smf_namf_comm_create_n1_n2_message_xact(sess, stream, param);
+    if (!xact) {
+        ogs_error("smf_namf_comm_create_n1_n2_message_xact() failed");
+        return;
+    }
+
     r = ogs_sbi_discover_and_send(xact);
     if (r != OGS_OK) {
         ogs_error("smf_namf_comm_send_n1_n2_message_transfer() failed");
@@ -276,17 +305,55 @@
 }
 
 void smf_namf_comm_send_n1_n2_pdu_establishment_reject(
-        smf_sess_t *sess)
+        smf_sess_t *sess, ogs_sbi_stream_t *stream)
 {
     smf_n1_n2_message_transfer_param_t param;
 
     memset(&param, 0, sizeof(param));
-    param.state = SMF_NETWORK_REQUESTED_PDU_SESSION_RELEASE;
+    param.state = SMF_UE_OR_NETWORK_REQUESTED_PDU_SESSION_RELEASE;
     param.n1smbuf = gsm_build_pdu_session_establishment_reject(sess,
         OGS_5GSM_CAUSE_NETWORK_FAILURE);
     ogs_assert(param.n1smbuf);
 
-    smf_namf_comm_send_n1_n2_message_transfer(sess, &param);
+    smf_namf_comm_send_n1_n2_message_transfer(sess, stream, &param);
+}
+
+void smf_sbi_send_sm_context_created_data(
+        smf_sess_t *sess, ogs_sbi_stream_t *stream)
+{
+    OpenAPI_sm_context_created_data_t SmContextCreatedData;
+
+    ogs_sbi_server_t *server = NULL;
+    ogs_sbi_header_t header;
+    ogs_sbi_message_t sendmsg;
+    ogs_sbi_response_t *response = NULL;
+
+    memset(&SmContextCreatedData, 0, sizeof(SmContextCreatedData));
+
+    memset(&sendmsg, 0, sizeof(sendmsg));
+
+    memset(&header, 0, sizeof(header));
+    header.service.name = (char *)OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION;
+    header.api.version = (char *)OGS_SBI_API_V1;
+    header.resource.component0 =
+        (char *)OGS_SBI_RESOURCE_NAME_SM_CONTEXTS;
+    header.resource.component1 = sess->sm_context_ref;
+
+    server = ogs_sbi_server_from_stream(stream);
+    ogs_assert(server);
+    sendmsg.http.location = ogs_sbi_server_uri(server, &header);
+    ogs_assert(sendmsg.http.location);
+
+    sendmsg.SmContextCreatedData = &SmContextCreatedData;
+
+    response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_CREATED);
+    ogs_assert(response);
+    ogs_assert(true == ogs_sbi_server_send_response(stream, response));
+
+    smf_metrics_inst_by_slice_add(&sess->serving_plmn_id, &sess->s_nssai,
+            SMF_METR_CTR_SM_PDUSESSIONCREATIONSUCC, 1);
+
+    ogs_free(sendmsg.http.location);
 }
 
 void smf_sbi_send_sm_context_create_error(
@@ -340,6 +407,267 @@
         ogs_pkbuf_free(n1smbuf);
 }
 
+void smf_sbi_send_pdu_session_created_data(
+        smf_sess_t *sess, ogs_sbi_stream_t *stream)
+{
+    int rv;
+    OpenAPI_pdu_session_created_data_t PduSessionCreatedData;
+
+    OpenAPI_tunnel_info_t hcnTunnelInfo;
+    char ssc_mode2;
+    OpenAPI_ambr_t sessionAmbr;
+    OpenAPI_list_t *qosFlowsSetupList = NULL;
+    OpenAPI_qos_flow_setup_item_t *qosFlowSetupItem = NULL;
+    OpenAPI_qos_flow_profile_t *qosFlowProfile = NULL;
+    OpenAPI_arp_t *Arp = NULL;
+
+    ogs_nas_qos_rule_t qos_ruleOGS_NAS_MAX_NUM_OF_QOS_RULE;
+    ogs_nas_qos_rules_t authorized_qos_rules;
+
+    ogs_nas_qos_flow_description_t
+        qos_flow_descriptionOGS_NAS_MAX_NUM_OF_QOS_FLOW_DESCRIPTION;
+    ogs_nas_qos_flow_descriptions_t authorized_qos_flow_descriptions;
+
+    /*
+     * TS29.502
+     * 6.1.6.2.10 Type: PduSessionCreatedData
+     *
+     * This IE shall be present if the H-SMF/SMF has assigned
+     * IPv6 interface identifier to the UE during
+     * the PDU session establishment for the Home-routed Roaming scenario
+     * or for a PDU session with an I-SMF.
+     *
+     * When present, it shall encode the UE IPv6 Interface Identifier
+     * to be used by the UE for its link-local address configuration
+     * with 16 hexadecimal digits.
+     *
+     * Pattern: "^A-Fa-f0-9{16}$"
+     */
+    char ue_ipv6_interface_id16+1; /* 16 + 1(string-termiante:'\0') */
+
+    int enc_len = 0;
+
+    OpenAPI_ref_to_binary_data_t n1SmInfoToUe;
+    ogs_pkbuf_t *n1SmBufToUe = NULL;
+
+    ogs_sbi_server_t *server = NULL;
+    ogs_sbi_header_t header;
+    ogs_sbi_message_t sendmsg;

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/sbi-path.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/sbi-path.h Changed

@@ -22,6 +22,7 @@
 
 #include "nudm-build.h"
 #include "namf-build.h"
+#include "nsmf-build.h"
 #include "gsm-build.h"
 #include "nnrf-build.h"
 #include "npcf-build.h"
@@ -35,17 +36,107 @@
 
 bool smf_sbi_send_request(
         ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact);
+
+/*
+ * PFCP delete triggers are defined in lib/pfcp/xact.h (values 1–7).
+ * To avoid overlap with OGS_PFCP_DELETE_TRIGGER_*, SMF states use:
+ *   - UPDATE_STATE_BASE at 0x10–0x14
+ *   - UECM_STATE_BASE   at 0x20–0x23
+ * HR flag is bit 7 (0x80).
+ */
+
+/* Common HR flag (bit 7) */
+#define SMF_STATE_HR             (1U << 7)          /* 0x80 */
+
+/* Base offset for SMF_CREATE states */
+#define SMF_CREATE_STATE_BASE       0x10U           /* CREATE at 0x10 */
+
+#define SMF_CREATE_STATE_NONE                       \
+    (SMF_CREATE_STATE_BASE + 0x00U)  /* 0x00 */
+
+/* Base offset for SMF_UPDATE states */
+#define SMF_UPDATE_STATE_BASE       0x20U           /* UPDATE at 0x20–0x24 */
+
+/* SMF_UPDATE base states */
+#define SMF_UPDATE_STATE_NONE                       \
+    (SMF_UPDATE_STATE_BASE + 0x00U)  /* 0x00 */
+#define SMF_UPDATE_STATE_ACTIVATING                 \
+    (SMF_UPDATE_STATE_BASE + 0x01U)  /* 0x01 */
+#define SMF_UPDATE_STATE_ACTIVATED_FROM_ACTIVATING  \
+    (SMF_UPDATE_STATE_BASE + 0x02U)  /* 0x02 */
+#define SMF_UPDATE_STATE_ACTIVATED_FROM_NON_ACTIVATING  \
+    (SMF_UPDATE_STATE_BASE + 0x03U)  /* 0x03 */
+#define SMF_UPDATE_STATE_ACTIVATED_FROM_XN_HANDOVER \
+    (SMF_UPDATE_STATE_BASE + 0x04U)  /* 0x04 */
+#define SMF_UPDATE_STATE_ACTIVATED_FROM_N2_HANDOVER \
+    (SMF_UPDATE_STATE_BASE + 0x05U)  /* 0x05 */
+#define SMF_UPDATE_STATE_DEACTIVATED                \
+    (SMF_UPDATE_STATE_BASE + 0x06U)  /* 0x06 */
+#define SMF_UPDATE_STATE_UE_REQ_MOD                 \
+    (SMF_UPDATE_STATE_BASE + 0x07U)  /* 0x07 */
+
+/* Base offset for SMF_REMOVE states */
+#define SMF_REMOVE_STATE_BASE       0x30U           /* REMOVE at 0x30 */
+
+#define SMF_REMOVE_STATE_NONE                       \
+    (SMF_REMOVE_STATE_BASE + 0x00U)  /* 0x00 */
+
+/* Base offset for SMF_UECM states */
+#define SMF_UECM_STATE_BASE         0x40U           /* UECM at 0x40–0x43 */
+
+/* SMF_UECM base states */
+#define SMF_UECM_STATE_NONE                 \
+    (SMF_UECM_STATE_BASE + 0x00U)  /* 0x20 */
+#define SMF_UECM_STATE_REGISTERED           \
+    (SMF_UECM_STATE_BASE + 0x01U)  /* 0x21 */
+#define SMF_UECM_STATE_DEREG_BY_AMF         \
+    (SMF_UECM_STATE_BASE + 0x02U)  /* 0x22 */
+#define SMF_UECM_STATE_DEREG_BY_N1N2        \
+    (SMF_UECM_STATE_BASE + 0x03U)  /* 0x23 */
+
+/* HR variants for SMF_UECM */
+#define SMF_UECM_STATE_REGISTERED_HR                \
+    (SMF_UECM_STATE_REGISTERED | SMF_STATE_HR)      /* 0xC1 */
+#define SMF_UECM_STATE_DEREG_BY_AMF_HR              \
+    (SMF_UECM_STATE_DEREG_BY_AMF | SMF_STATE_HR)    /* 0xC2 */
+#define SMF_UECM_STATE_DEREG_BY_N1N2_HR             \
+    (SMF_UECM_STATE_DEREG_BY_N1N2 | SMF_STATE_HR)   /* 0xC3 */
+
 int smf_sbi_discover_and_send(
         ogs_sbi_service_type_e service_type,
         ogs_sbi_discovery_option_t *discovery_option,
         ogs_sbi_request_t *(*build)(smf_sess_t *sess, void *data),
         smf_sess_t *sess, ogs_sbi_stream_t *stream, int state, void *data);
 
+/**
+ * Return true if the PDU session anchor SMF is in the HPLMN
+ * (Home-Routed Roaming, HR)
+ */
+static inline bool smf_uecm_anchor_in_hplmn(int state)
+{
+    return !!(state & SMF_STATE_HR);
+}
+
+/**
+ * Return true if the PDU session anchor SMF is in the VPLMN
+ * (Non-Roaming or Local Break-Out Roaming, LBO)
+ */
+static inline bool smf_uecm_anchor_in_vplmn(int state)
+{
+    return !(state & SMF_STATE_HR);
+}
+
+ogs_sbi_xact_t *smf_namf_comm_create_n1_n2_message_xact(
+        smf_sess_t *sess, ogs_sbi_stream_t *stream,
+        smf_n1_n2_message_transfer_param_t *param);
 void smf_namf_comm_send_n1_n2_message_transfer(
-        smf_sess_t *sess, smf_n1_n2_message_transfer_param_t *param);
+        smf_sess_t *sess, ogs_sbi_stream_t *stream,
+        smf_n1_n2_message_transfer_param_t *param);
 void smf_namf_comm_send_n1_n2_pdu_establishment_reject(
-        smf_sess_t *sess);
+        smf_sess_t *sess, ogs_sbi_stream_t *stream);
 
+void smf_sbi_send_sm_context_created_data(
+        smf_sess_t *sess, ogs_sbi_stream_t *stream);
 void smf_sbi_send_sm_context_create_error(
         ogs_sbi_stream_t *stream,
         int status, ogs_sbi_app_errno_e err,
@@ -101,8 +192,54 @@
         OpenAPI_n2_sm_info_type_e n2_sm_info_type,
         OpenAPI_up_cnx_state_e up_cnx_state);
 
+/* Cleanup modes for session resources via SBI */
+typedef enum {
+    SMF_SBI_CLEANUP_MODE_POLICY_FIRST = 1,   /* Policy→Subscr→Context */
+    SMF_SBI_CLEANUP_MODE_SUBSCRIPTION_FIRST, /* Subscr→Context */
+    SMF_SBI_CLEANUP_MODE_CONTEXT_ONLY        /* Context only */
+} smf_sbi_cleanup_mode_t;
+
+/**
+ * Send SBI request to clean up session resources.
+ *
+ * @param sess   Session object pointer.
+ * @param stream SBI stream object pointer.
+ * @param state  State code for the cleanup action.
+ * @param mode   Cleanup mode to select the workflow.
+ * @return OGS_OK on success, else OGS_ERROR.
+ */
+int smf_sbi_cleanup_session(
+    smf_sess_t              *sess,
+    ogs_sbi_stream_t        *stream,
+    int                      state,
+    smf_sbi_cleanup_mode_t   mode);
+
 bool smf_sbi_send_sm_context_status_notify(smf_sess_t *sess);
 
+void smf_sbi_send_pdu_session_created_data(
+        smf_sess_t *sess, ogs_sbi_stream_t *stream);
+void smf_sbi_send_pdu_session_create_error(
+        ogs_sbi_stream_t *stream,
+        int status, ogs_sbi_app_errno_e err, int n1SmCause,
+        const char *title, const char *detail,
+        ogs_pkbuf_t *n1SmBufToUe);
+
+void smf_sbi_send_hsmf_update_error(
+        ogs_sbi_stream_t *stream,
+        int status, ogs_sbi_app_errno_e err, int n1SmCause,
+        const char *title, const char *detail,
+        ogs_pkbuf_t *n1SmBufToUe);
+void smf_sbi_send_vsmf_update_error(
+        ogs_sbi_stream_t *stream,
+        int status, ogs_sbi_app_errno_e err, int n1SmCause,
+        const char *title, const char *detail,
+        ogs_pkbuf_t *n1SmBufFromUe);
+
+void smf_sbi_send_released_data(
+        smf_sess_t *sess, ogs_sbi_stream_t *stream);
+
+bool smf_sbi_send_status_notify(smf_sess_t *sess);
+
 #ifdef __cplusplus
 }
 #endif

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/smf-sm.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/smf-sm.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -30,6 +30,8 @@
 #include "namf-handler.h"
 #include "nsmf-handler.h"
 #include "npcf-handler.h"
+#include "nsmf-handler.h"
+#include "binding.h"
 
 void smf_state_initial(ogs_fsm_t *s, smf_event_t *e)
 {
@@ -73,6 +75,8 @@
     ogs_sbi_stream_t *stream = NULL;
     ogs_pool_id_t stream_id = OGS_INVALID_POOL_ID;
     ogs_sbi_request_t *sbi_request = NULL;
+    int state = 0;
+    bool unknown_res_status = false;
 
     ogs_sbi_nf_instance_t *nf_instance = NULL;
     ogs_sbi_subscription_data_t *subscription_data = NULL;
@@ -550,7 +554,7 @@
                         break;
 
                     DEFAULT
-                        sess = smf_sess_add_by_sbi_message(&sbi_message);
+                        sess = smf_sess_add_by_sm_context(&sbi_message);
                         if (!sess) {
                             ogs_error("smf_sess_add_by_sbi_message() failed");
                             smf_sbi_send_sm_context_create_error(stream,
@@ -587,6 +591,124 @@
                 }
                 break;
 
+            CASE(OGS_SBI_RESOURCE_NAME_PDU_SESSIONS)
+                SWITCH(sbi_message.h.method)
+                CASE(OGS_SBI_HTTP_METHOD_POST)
+                    SWITCH(sbi_message.h.resource.component2)
+                    CASE(OGS_SBI_RESOURCE_NAME_MODIFY)
+                    CASE(OGS_SBI_RESOURCE_NAME_RELEASE)
+                        if (!sbi_message.h.resource.component1) {
+                            ogs_error("No pduSessionRef %s",
+                                    sbi_message.h.resource.component1);
+                            smf_sbi_send_hsmf_update_error(stream,
+                                    OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                                    OGS_SBI_APP_ERRNO_NULL,
+                                    OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION,
+                                    "No pduSessionRef",
+                                    sbi_message.h.resource.component1, NULL);
+                            break;
+                        }
+
+                        sess = smf_sess_find_by_pdu_session_ref(
+                                sbi_message.h.resource.component1);
+
+                        if (!sess) {
+                            ogs_warn("Not found %s", sbi_message.h.uri);
+                            smf_sbi_send_hsmf_update_error(stream,
+                                    OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                                    OGS_SBI_APP_ERRNO_NULL,
+                                    OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION,
+                                    "Not found", sbi_message.h.uri, NULL);
+                        }
+                        break;
+
+                    DEFAULT
+                        sess = smf_sess_add_by_pdu_session(&sbi_message);
+                        if (!sess) {
+                            ogs_error("smf_sess_add_by_sbi_message() failed");
+                            smf_sbi_send_pdu_session_create_error(stream,
+                                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                                OGS_SBI_APP_ERRNO_NULL,
+                                OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION,
+                                "smf_sess_add_by_sbi_message() failed",
+                                NULL, NULL);
+                            break;
+                        }
+
+                        smf_metrics_inst_by_slice_add(NULL, NULL,
+                                SMF_METR_CTR_SM_PDUSESSIONCREATIONREQ, 1);
+                    END
+                    break;
+
+                DEFAULT
+                    ogs_error("Invalid HTTP method %s", sbi_message.h.method);
+                    ogs_assert(true ==
+                        ogs_sbi_server_send_error(stream,
+                            OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message,
+                            "Invalid HTTP method", sbi_message.h.method,
+                            NULL));
+                END
+
+                if (sess) {
+                    smf_ue = smf_ue_find_by_id(sess->smf_ue_id);
+                    ogs_assert(smf_ue);
+                    ogs_assert(OGS_FSM_STATE(&sess->sm));
+
+                    e->sess_id = sess->id;
+                    e->h.sbi.message = &sbi_message;
+                    ogs_fsm_dispatch(&sess->sm, e);
+                }
+                break;
+
+            CASE(OGS_SBI_RESOURCE_NAME_VSMF_PDU_SESSIONS)
+                SWITCH(sbi_message.h.method)
+                CASE(OGS_SBI_HTTP_METHOD_POST)
+                    if (!sbi_message.h.resource.component1) {
+                        ogs_error("No smContextRef %s",
+                                sbi_message.h.resource.component1);
+                        smf_sbi_send_vsmf_update_error(stream,
+                                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                                OGS_SBI_APP_ERRNO_NULL,
+                                OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION,
+                                "No smContextRef",
+                                sbi_message.h.resource.component1, NULL);
+                        break;
+                    }
+
+                    sess = smf_sess_find_by_sm_context_ref(
+                            sbi_message.h.resource.component1);
+
+                    if (!sess) {
+                        ogs_warn("Not found %s", sbi_message.h.uri);
+                        smf_sbi_send_vsmf_update_error(stream,
+                                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                                OGS_SBI_APP_ERRNO_NULL,
+                                OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION,
+                                "Not found", sbi_message.h.uri, NULL);
+                    }
+                    break;
+
+                DEFAULT
+                    ogs_error("Invalid HTTP method %s", sbi_message.h.method);
+                    ogs_assert(true ==
+                        ogs_sbi_server_send_error(stream,
+                            OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message,
+                            "Invalid HTTP method", sbi_message.h.method,
+                            NULL));
+                    break;
+                END
+
+                if (sess) {
+                    smf_ue = smf_ue_find_by_id(sess->smf_ue_id);
+                    ogs_assert(smf_ue);
+                    ogs_assert(OGS_FSM_STATE(&sess->sm));
+
+                    e->sess_id = sess->id;
+                    e->h.sbi.message = &sbi_message;
+                    ogs_fsm_dispatch(&sess->sm, e);
+                }
+                break;
+
             DEFAULT
                 ogs_error("Invalid resource name %s",
                         sbi_message.h.resource.component0);
@@ -631,10 +753,13 @@
 
                 SWITCH(sbi_message.h.resource.component2)
                 CASE(OGS_SBI_RESOURCE_NAME_UPDATE)
+#define ENABLE_PCF_INITIATED_SESSION_RELEASE 0
+#if !ENABLE_PCF_INITIATED_SESSION_RELEASE
                     smf_npcf_smpolicycontrol_handle_update_notify(
                             sess, stream, &sbi_message);
                     break;
                 CASE(OGS_SBI_RESOURCE_NAME_TERMINATE)
+#endif
                     smf_npcf_smpolicycontrol_handle_terminate_notify(
                             sess, stream, &sbi_message);
                     break;
@@ -836,6 +961,7 @@
         CASE(OGS_SBI_SERVICE_NAME_NUDM_SDM)
         CASE(OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL)
         CASE(OGS_SBI_SERVICE_NAME_NAMF_COMM)
+        CASE(OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION)
             sbi_xact_id = OGS_POINTER_TO_UINT(e->h.sbi.data);
             ogs_assert(sbi_xact_id >= OGS_MIN_POOL_ID &&
                     sbi_xact_id <= OGS_MAX_POOL_ID);
@@ -877,9 +1003,6 @@
             break;
 
         CASE(OGS_SBI_SERVICE_NAME_NUDM_UECM)
-            int state = 0;
-            bool unknown_res_status = false;
-
             sbi_xact_id = OGS_POINTER_TO_UINT(e->h.sbi.data);
             ogs_assert(sbi_xact_id >= OGS_MIN_POOL_ID &&
                     sbi_xact_id <= OGS_MAX_POOL_ID);
@@ -914,13 +1037,16 @@
             smf_ue = smf_ue_find_by_id(sess->smf_ue_id);
             ogs_assert(smf_ue);
 
-            if (state == SMF_UECM_STATE_REGISTERED) {
+            if (state == SMF_UECM_STATE_REGISTERED ||
+                state == SMF_UECM_STATE_REGISTERED_HR) {
                 /* SMF Registration */
                 if (sbi_message.res_status != OGS_SBI_HTTP_STATUS_OK &&

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/smf/smf-sm.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/smf/smf-sm.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/udr/nudr-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/udr/nudr-handler.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/upf/gtp-path.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/upf/gtp-path.c Changed

@@ -214,7 +214,7 @@
         upf_sess_urr_acc_add(sess, pdr->urri, recvbuf->len, false);
 
     ogs_assert(true == ogs_pfcp_up_handle_pdr(
-                pdr, OGS_GTPU_MSGTYPE_GPDU, NULL, recvbuf, &report));
+                pdr, OGS_GTPU_MSGTYPE_GPDU, 0, NULL, recvbuf, &report));
 
     /*
      * Issue #2210, Discussion #2208, #2209
@@ -316,14 +316,14 @@
     if (header_desc.type == OGS_GTPU_MSGTYPE_ECHO_REQ) {
         ogs_pkbuf_t *echo_rsp;
 
-        ogs_debug("RECV Echo Request from %s", OGS_ADDR(&from, buf1));
+        ogs_info("RECV Echo Request from %s", OGS_ADDR(&from, buf1));
         echo_rsp = ogs_gtp2_handle_echo_req(pkbuf);
         ogs_expect(echo_rsp);
         if (echo_rsp) {
             ssize_t sent;
 
             /* Echo reply */
-            ogs_debug("SEND Echo Response to %s", OGS_ADDR(&from, buf1));
+            ogs_info("SEND Echo Response to %s", OGS_ADDR(&from, buf1));
 
             sent = ogs_sendto(fd, echo_rsp->data, echo_rsp->len, 0, &from);
             if (sent < 0 || sent != echo_rsp->len) {
@@ -440,10 +440,23 @@
 
             ogs_list_for_each(&pfcp_sess->pdr_list, pdr) {
 
-                /* Check if Source Interface */
+                /*
+                 * Originally, we checked the Source Interface
+                 * for packets received with a TEID.
+                 *
+                 * However, in the case of Home Routed Roaming,
+                 * packets arriving at the V-UPF from the Core
+                 * do not come through a TUN interface
+                 * but as standard GTP-U packets.
+                 *
+                 * Therefore, this code has been removed to support
+                 * the roaming functionality.
+                 */
+#if 0 /* <DEPRECATED> */
                 if (pdr->src_if != OGS_PFCP_INTERFACE_ACCESS &&
                     pdr->src_if != OGS_PFCP_INTERFACE_CP_FUNCTION)
                     continue;
+#endif
 
                 /* Check if TEID */
                 if (header_desc.teid != pdr->f_teid.teid)
@@ -503,18 +516,92 @@
         far = pdr->far;
         ogs_assert(far);
 
-        if (ip_h->ip_v == 4 && sess->ipv4) {
-            src_addr = (void *)&ip_h->ip_src.s_addr;
-            ogs_assert(src_addr);
+        /*
+         * From Issue #1354
+         *
+         * Do not check Router Advertisement
+         *    pdr->src_if = OGS_PFCP_INTERFACE_CP_FUNCTION;
+         *    far->dst_if = OGS_PFCP_INTERFACE_ACCESS;
+         *
+         * Do not check Indirect Tunnel
+         *    pdr->dst_if = OGS_PFCP_INTERFACE_ACCESS;
+         *    far->dst_if = OGS_PFCP_INTERFACE_ACCESS;
+         */
 
-            /*
-             * From Issue #1354
-             *
-             * Do not check Indirect Tunnel
-             *    pdr->dst_if = OGS_PFCP_INTERFACE_ACCESS;
-             *    far->dst_if = OGS_PFCP_INTERFACE_ACCESS;
-             */
-            if (far->dst_if != OGS_PFCP_INTERFACE_ACCESS) {
+        /*
+         * The implementation was initially based on Issue #1354,
+         * where the system was designed not to perform checks
+         * when FAR->dst_if was set to ACCESS.
+         *
+         * However, this has now been updated
+         * to a new approach that checks for IP source spoofing
+         * only when PDR->src_if is set to ACCESS.
+         *
+         * That said, for Home Routed Roaming scenarios, the system skips
+         * this process during uplink traffic, as the V-UPF does not hold
+         * IP address information in such cases.
+         *
+         * <Normal>
+         * o DL
+         *  PDR->src : Core/N6
+         *  FAT->dst : Access/N3
+         * o UL
+         *  PDR->src : Access/N3
+         *  FAT->dst : Core/N6
+         * o CP2UP
+         *  PDR->src : CP-function
+         *  FAT->dst : Access/N3
+         * o UP2CP
+         *  PDR->src : Access/N3
+         *  FAT->dst : CP-function
+         *
+         * <Indirect>
+         *  PDR->src : Access/UL-Forwarding
+         *  FAT->dst : Access/DL-Forwarding
+         *
+         * <Home Routed Roaming>
+         * - VPLMN
+         * o DL
+         *  PDR->src : Core/N9-for-roaming
+         *  FAT->dst : Access/N3
+         * o UL
+         *  PDR->src : Access/N3
+         *  FAT->dst : Core/N9-for-roaming
+         * - HPLMN
+         * o DL
+         *  PDR->src : Core/N6
+         *  FAT->dst : Access/N9-for-roaming
+         * o UL
+         *  PDR->src : Access/N9-for-roaming
+         *  FAT->dst : Core/N6
+         */
+
+        /*
+         * We first verify whether the Source Interface of the PDR is set
+         * to ACCESS and if it corresponds to N3 3GPP ACCESS.
+         *
+         * This is because IP source spoofing checks are performed only
+         * in such cases.
+         */
+        if (pdr->src_if == OGS_PFCP_INTERFACE_ACCESS &&
+            pdr->src_if_type_presence == true &&
+            (pdr->src_if_type == OGS_PFCP_3GPP_INTERFACE_TYPE_N3_3GPP_ACCESS ||
+             pdr->src_if_type == OGS_PFCP_3GPP_INTERFACE_TYPE_N9_FOR_ROAMING)) {
+
+            if (far->dst_if_type_presence == true &&
+                far->dst_if_type ==
+                    OGS_PFCP_3GPP_INTERFACE_TYPE_N9_FOR_ROAMING) {
+                /*
+                 * <SKIP>
+                 *
+                 * However, Home Routed Roaming is excluded from this check,
+                 * as the V-UPF does not have the necessary IP address
+                 * information to perform the verification.
+                 */
+
+            } else if (ip_h->ip_v == 4 && sess->ipv4) {
+                src_addr = (void *)&ip_h->ip_src.s_addr;
+                ogs_assert(src_addr);
 
                 if (src_addr0 == sess->ipv4->addr0) {
                     /* Source IP address should be matched in uplink */
@@ -529,60 +616,46 @@
 
                     goto cleanup;
                 }
-            }
 
-            subnet = sess->ipv4->subnet;
-            eth_type = ETHERTYPE_IP;
+                subnet = sess->ipv4->subnet;
+                eth_type = ETHERTYPE_IP;
 
-        } else if (ip_h->ip_v == 6 && sess->ipv6) {
-            struct ip6_hdr *ip6_h = (struct ip6_hdr *)pkbuf->data;
-            ogs_assert(ip6_h);
-            src_addr = (void *)ip6_h->ip6_src.s6_addr;
-            ogs_assert(src_addr);
+            } else if (ip_h->ip_v == 6 && sess->ipv6) {
+                struct ip6_hdr *ip6_h = (struct ip6_hdr *)pkbuf->data;
+                ogs_assert(ip6_h);
+                src_addr = (void *)ip6_h->ip6_src.s6_addr;
+                ogs_assert(src_addr);
 
-            /*
-             * From Issue #1354
-             *
-             * Do not check Router Advertisement
-             *    pdr->src_if = OGS_PFCP_INTERFACE_CP_FUNCTION;
-             *    far->dst_if = OGS_PFCP_INTERFACE_ACCESS;
-             *
-             * Do not check Indirect Tunnel
-             *    pdr->dst_if = OGS_PFCP_INTERFACE_ACCESS;
-             *    far->dst_if = OGS_PFCP_INTERFACE_ACCESS;
-             */
-            if (far->dst_if != OGS_PFCP_INTERFACE_ACCESS) {
-
-/*
- * Discussion #1776 was raised,
- * but we decided not to allow unspecified addresses
- * because Open5GS has already sent interface identifiers
- * in the registgration/attach process.
- *
- *
- * RFC4861
- * 4.  Message Formats
- * 4.1.  Router Solicitation Message Format

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/src/upf/n4-handler.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/src/upf/n4-handler.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/tests/common/context.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/tests/common/context.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2025 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -1599,6 +1599,11 @@
                             "pre_emption_capability", BCON_INT32(1),
                         "}",
                     "}",
+#if 0
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                 "}", "",
             "}", "",
             "security", "{",
@@ -1704,6 +1709,11 @@
                                  "description", BCON_UTF8("permit out udp from 10.200.136.98/32 1-65535 to assigned 50021"), "}",
                         "",
                     "}", "",
+#if 0
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                 "}", "",
             "}", "",
             "security", "{",
@@ -1805,6 +1815,11 @@
                                  "description", BCON_UTF8("permit out udp from 10.200.136.98/32 23455 to assigned 1-65535"), "}",
                         "",
                     "}", "",
+#if 0
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                 "}", "",
             "}", "",
             "security", "{",
@@ -1871,6 +1886,11 @@
                             "pre_emption_capability", BCON_INT32(1),
                         "}",
                     "}",
+#if 0
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                   "{",
                     "name", BCON_UTF8("ims"),
@@ -1933,6 +1953,11 @@
                                  "description", BCON_UTF8("permit out udp from 10.200.136.98/32 1-65535 to assigned 50021"), "}",
                         "",
                     "}", "",
+#if 0
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                 "",
             "}", "",
@@ -2000,6 +2025,11 @@
                             "pre_emption_capability", BCON_INT32(1),
                         "}",
                     "}",
+#if 0
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                   "{",
                     "name", BCON_UTF8("ims"),
@@ -2084,6 +2114,11 @@
                         "}",
                       "}",
                     "",
+#if 0
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                 "",
             "}", "",
@@ -2152,6 +2187,11 @@
                             "pre_emption_capability", BCON_INT32(1),
                         "}",
                     "}",
+#if 1
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                   "{",
                     "name", BCON_UTF8("ims"),
@@ -2236,6 +2276,11 @@
                         "}",
                       "}",
                     "",
+#if 1
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                 "",
               "}",
@@ -2264,6 +2309,11 @@
                             "pre_emption_capability", BCON_INT32(1),
                         "}",
                     "}",
+#if 1
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                   "{",
                     "name", BCON_UTF8("ims"),
@@ -2348,6 +2398,11 @@
                         "}",
                       "}",
                     "",
+#if 1
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                 "",
               "}",
@@ -2377,6 +2432,11 @@
                             "pre_emption_capability", BCON_INT32(1),
                         "}",
                     "}",
+#if 1
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                   "{",
                     "name", BCON_UTF8("ims"),
@@ -2461,6 +2521,11 @@
                         "}",
                       "}",
                     "",
+#if 1
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                 "",
               "}",
@@ -2530,6 +2595,11 @@
                             "pre_emption_capability", BCON_INT32(1),
                         "}",
                     "}",
+#if 1
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                   "{",
                     "name", BCON_UTF8("ims"),
@@ -2614,6 +2684,11 @@
                         "}",
                       "}",
                     "",
+#if 1
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                 "",
               "}",
@@ -2642,6 +2717,11 @@
                             "pre_emption_capability", BCON_INT32(1),
                         "}",
                     "}",
+#if 1
+                    "lbo_roaming_allowed", BCON_BOOL(true),
+#else
+                    "lbo_roaming_allowed", BCON_BOOL(false),
+#endif
                   "}",
                   "{",
                     "name", BCON_UTF8("ims2"),
@@ -2726,6 +2806,11 @@

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/tests/common/gtpu.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/tests/common/gtpu.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -189,6 +189,7 @@
 
     gnode.addr.ogs_sin_port = htobe16(OGS_GTPV1_U_UDP_PORT);
     gnode.sock = node->sock;
+    ogs_assert(gnode.sock);
 
     if (bearer->qfi) {
         if (sess->upf_n3_ip.ipv4) {
@@ -220,7 +221,14 @@
         ogs_assert_if_reached();
     }
 
-    return ogs_gtp2_send_user_plane(&gnode, header_desc, pkbuf);
+    ogs_gtp2_encapsulate_header(header_desc, pkbuf);
+
+    ogs_assert(OGS_OK == ogs_gtp_send_with_teid(
+            gnode.sock, pkbuf, header_desc->teid, &gnode.addr));
+
+    ogs_pkbuf_free(pkbuf);
+
+    return OGS_OK;
 }
 
 int test_gtpu_send_ping(
@@ -464,6 +472,45 @@
     return test_gtpu_send(node, bearer, &header_desc, pkbuf);
 }
 
+int test_gtpu_send_end_marker(
+        ogs_socknode_t *node, test_bearer_t *bearer)
+{
+    test_sess_t *sess = NULL;
+
+    ogs_gtp2_header_desc_t header_desc;
+
+    ogs_pkbuf_t *pkbuf = NULL;
+
+    ogs_assert(bearer);
+    sess = bearer->sess;
+    ogs_assert(sess);
+
+    pkbuf = ogs_pkbuf_alloc(NULL, OGS_GTPV1U_5GC_HEADER_LEN);
+    ogs_assert(pkbuf);
+    ogs_pkbuf_reserve(pkbuf, OGS_GTPV1U_5GC_HEADER_LEN);
+
+    memset(&header_desc, 0, sizeof(header_desc));
+
+    header_desc.type = OGS_GTPU_MSGTYPE_END_MARKER;
+
+    if (bearer->qfi) {
+        /* 5GC */
+        header_desc.teid = sess->upf_n3_teid;
+        header_desc.pdu_type =
+            OGS_GTP2_EXTENSION_HEADER_PDU_TYPE_UL_PDU_SESSION_INFORMATION;
+        header_desc.qos_flow_identifier = bearer->qfi;
+
+    } else if (bearer->ebi) {
+        /* EPC */
+        header_desc.teid = bearer->sgw_s1u_teid;
+
+    } else {
+        ogs_fatal("No QFI%d and EBI%d", bearer->qfi, bearer->ebi);
+        ogs_assert_if_reached();
+    }
+
+    return test_gtpu_send(node, bearer, &header_desc, pkbuf);
+}
 
 int test_gtpu_send_error_indication(
         ogs_socknode_t *node, test_bearer_t *bearer)

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/tests/common/gtpu.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/tests/common/gtpu.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/tests/common/test-common.h -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/tests/common/test-common.h Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/tests/handover/5gc-n2-test.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/tests/handover/5gc-n2-test.c Changed

@@ -849,10 +849,12 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
 
+#if !HOME_ROUTED_ROAMING_TEST
     /* Receive End Mark */
     recvbuf = test_gtpu_read(gtpu1);
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
+#endif
 
     /* Receive UEContextReleaseCommand */
     amf_ue_ngap_id = test_ue->amf_ue_ngap_id;
@@ -966,10 +968,12 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
 
+#if !HOME_ROUTED_ROAMING_TEST
     /* Receive End Mark */
     recvbuf = test_gtpu_read(gtpu2);
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
+#endif
 
     /* Receive UEContextReleaseCommand */
     amf_ue_ngap_id = test_ue->amf_ue_ngap_id;
@@ -1881,10 +1885,12 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
 
+#if !HOME_ROUTED_ROAMING_TEST
     /* Receive End Mark */
     recvbuf = test_gtpu_read(gtpu1);
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
+#endif
 
     /* Receive UEContextReleaseCommand */
     amf_ue_ngap_id = test_ue->amf_ue_ngap_id;
@@ -2029,10 +2035,12 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
 
+#if !HOME_ROUTED_ROAMING_TEST
     /* Receive End Mark */
     recvbuf = test_gtpu_read(gtpu2);
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
+#endif
 
     /* Receive UEContextReleaseCommand */
     amf_ue_ngap_id = test_ue->amf_ue_ngap_id;
@@ -2534,10 +2542,12 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
 
+#if !HOME_ROUTED_ROAMING_TEST
     /* Receive End Mark */
     recvbuf = test_gtpu_read(gtpu1);
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
+#endif
 
     /* Receive UEContextReleaseCommand */
     amf_ue_ngap_id = test_ue->amf_ue_ngap_id;

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/tests/handover/5gc-xn-test.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/tests/handover/5gc-xn-test.c Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/tests/registration/simple-test.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/tests/registration/simple-test.c Changed

@@ -19,6 +19,8 @@
 
 #include "test-common.h"
 
+#define ENABLE_SMF_INITIATED_SESSION_RELEASE 0
+
 static void test1_func(abts_case *tc, void *data)
 {
     int rv;
@@ -258,6 +260,44 @@
     ogs_pkbuf_free(recvbuf);
 #endif
 
+#if ENABLE_SMF_INITIATED_SESSION_RELEASE
+    /* Receive PDUSessionResourceReleaseCommand +
+     * DL NAS transport +
+     * PDU session release command */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_PDUSessionResourceRelease,
+            test_ue->ngap_procedure_code);
+
+    /* Send PDUSessionResourceReleaseResponse */
+    sendbuf = testngap_build_pdu_session_resource_release_response(sess);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Send UplinkNASTransport +
+     * UL NAS trasnport +
+     * PDU session resource release complete */
+    sess->ul_nas_transport_param.request_type = 0;
+    sess->ul_nas_transport_param.dnn = 0;
+    sess->ul_nas_transport_param.s_nssai = 0;
+
+    sess->pdu_session_establishment_param.ssc_mode = 0;
+    sess->pdu_session_establishment_param.epco = 0;
+
+    gsmbuf = testgsm_build_pdu_session_release_complete(sess);
+    ABTS_PTR_NOTNULL(tc, gsmbuf);
+    gmmbuf = testgmm_build_ul_nas_transport(sess,
+            OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, gsmbuf);
+    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);
+#endif
+
     /* Send UEContextReleaseRequest */
     sendbuf = testngap_build_ue_context_release_request(test_ue,
             NGAP_Cause_PR_radioNetwork, NGAP_CauseRadioNetwork_user_inactivity,

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/tests/vonr/af-test.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/tests/vonr/af-test.c Changed

@@ -3966,6 +3966,18 @@
     test_ue_remove(test_ue);
 }
 
+#if !HOME_ROUTED_ROAMING_TEST
+/**
+ * test8_func:
+ *   - Simulates absence of N2 Resource Release Ack (step 8)
+ *     and PDU Session Release Accept (step 11) from gNB/UE.
+ *   - In Home Routed Roaming, V-SMF will not send the
+ *     Nsmf_PDUSession_Update Response (step 14), causing
+ *     the SBI client to timeout after 10 seconds.
+ *   - Subsequent deregistration triggers a PFCP deactivation
+ *     modification, but UPF has no session, leading to
+ *     a No Context error.
+ */
 static void test8_func(abts_case *tc, void *data)
 {
     int rv;
@@ -4327,12 +4339,19 @@
     /* Clear Test UE Context */
     test_ue_remove(test_ue);
 }
+#endif
 
 
 abts_suite *test_af(abts_suite *suite)
 {
     suite = ADD_SUITE(suite)
 
+/**
+ * abts_suite test_af:
+ *   - Always run test1_func through test7_func.
+ *   - Conditionally include test8_func based on
+ *     HOME_ROUTED_ROAMING_TEST flag.
+ */
     abts_run_test(suite, test1_func, NULL);
     abts_run_test(suite, test2_func, NULL);
     abts_run_test(suite, test3_func, NULL);
@@ -4340,7 +4359,9 @@
     abts_run_test(suite, test5_func, NULL);
     abts_run_test(suite, test6_func, NULL);
     abts_run_test(suite, test7_func, NULL);
+#if !HOME_ROUTED_ROAMING_TEST
     abts_run_test(suite, test8_func, NULL);
+#endif
 
     return suite;
 }

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/tests/vonr/session-test.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/tests/vonr/session-test.c Changed

@@ -1367,6 +1367,8 @@
 
     bson_t *doc = NULL;
 
+    NGAP_ProcedureCode_t ngap_procedure_code;
+
     /* Setup Test UE & Session Context */
     memset(&mobile_identity_suci, 0, sizeof(mobile_identity_suci));
 
@@ -1551,23 +1553,62 @@
     rv = testgnb_ngap_send(ngap, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
-    /* Receive PDUSessionResourceSetupRequest +
+    /*
+     * Receive PDUSessionResourceSetupRequest +
+     * DL NAS transport +
+     * PDU session establishment accept
+     *
+     * OR
+     *
+     * Receive PDUSessionResourceModifyRequest +
      * DL NAS transport +
-     * PDU session establishment accept */
+     * PDU session modification command
+     */
     recvbuf = testgnb_ngap_read(ngap);
     ABTS_PTR_NOTNULL(tc, recvbuf);
     testngap_recv(test_ue, recvbuf);
-    ABTS_INT_EQUAL(tc,
-            NGAP_ProcedureCode_id_PDUSessionResourceSetup,
-            test_ue->ngap_procedure_code);
 
-    /* Receive PDU session establishment accept */
+    ngap_procedure_code = test_ue->ngap_procedure_code;
+
+    /*
+     * Receive PDUSessionResourceSetupRequest +
+     * DL NAS transport +
+     * PDU session establishment accept
+     *
+     * OR
+     *
+     * Receive PDUSessionResourceModifyRequest +
+     * DL NAS transport +
+     * PDU session modification command
+     */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    ngap_procedure_code += test_ue->ngap_procedure_code;
+
+    /*
+     * Receive PDUSessionResourceSetupRequest +
+     * DL NAS transport +
+     * PDU session establishment accept
+     *
+     * OR
+     *
+     * Receive PDUSessionResourceModifyRequest +
+     * DL NAS transport +
+     * PDU session modification command
+     */
     recvbuf = testgnb_ngap_read(ngap);
     ABTS_PTR_NOTNULL(tc, recvbuf);
     testngap_recv(test_ue, recvbuf);
+
+    ngap_procedure_code += test_ue->ngap_procedure_code;
+
     ABTS_INT_EQUAL(tc,
-            NGAP_ProcedureCode_id_PDUSessionResourceSetup,
-            test_ue->ngap_procedure_code);
+            NGAP_ProcedureCode_id_PDUSessionResourceSetup +
+            NGAP_ProcedureCode_id_PDUSessionResourceSetup +
+            NGAP_ProcedureCode_id_PDUSessionResourceModify,
+            ngap_procedure_code);
 
     /* Send GTP-U ICMP Packet */
     qos_flow1 = test_qos_flow_find_by_qfi(sess5, 1);
@@ -1601,16 +1642,6 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
 
-    /* Receive PDUSessionResourceModifyRequest +
-     * DL NAS transport +
-     * PDU session modification command */
-    recvbuf = testgnb_ngap_read(ngap);
-    ABTS_PTR_NOTNULL(tc, recvbuf);
-    testngap_recv(test_ue, recvbuf);
-    ABTS_INT_EQUAL(tc,
-            NGAP_ProcedureCode_id_PDUSessionResourceModify,
-            test_ue->ngap_procedure_code);
-
     /* Send PDU session resource modify response */
     qos_flow2 = test_qos_flow_find_by_qfi(sess6, 2);
     ogs_assert(qos_flow2);

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/tests/vonr/simple-test.c -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/tests/vonr/simple-test.c Changed

@@ -20,6 +20,8 @@
 #include "test-common.h"
 #include "af/sbi-path.h"
 
+#define ENABLE_PCF_INITIATED_SESSION_RELEASE 0
+
 static void test1_func(abts_case *tc, void *data)
 {
     int rv;
@@ -315,6 +317,7 @@
     af_local_send_to_pcf(af_sess, &af_param,
             af_npcf_policyauthorization_build_create);
 
+#if !ENABLE_PCF_INITIATED_SESSION_RELEASE
     /* Receive PDUSessionResourceModifyRequest +
      * DL NAS transport +
      * PDU session modification command */
@@ -411,10 +414,48 @@
     ABTS_PTR_NOTNULL(tc, sendbuf);
     rv = testgnb_ngap_send(ngap, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
+#else
+    /* Receive PDUSessionResourceReleaseCommand +
+     * DL NAS transport +
+     * PDU session release command */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_PDUSessionResourceRelease,
+            test_ue->ngap_procedure_code);
+
+    /* Send PDUSessionResourceReleaseResponse */
+    sendbuf = testngap_build_pdu_session_resource_release_response(sess);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Send UplinkNASTransport +
+     * UL NAS trasnport +
+     * PDU session resource release complete */
+    sess->ul_nas_transport_param.request_type = 0;
+    sess->ul_nas_transport_param.dnn = 0;
+    sess->ul_nas_transport_param.s_nssai = 0;
+
+    sess->pdu_session_establishment_param.ssc_mode = 0;
+    sess->pdu_session_establishment_param.epco = 0;
+
+    gsmbuf = testgsm_build_pdu_session_release_complete(sess);
+    ABTS_PTR_NOTNULL(tc, gsmbuf);
+    gmmbuf = testgmm_build_ul_nas_transport(sess,
+            OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, gsmbuf);
+    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);
+#endif
 
     /* Wait for PDU session resource modify complete */
     ogs_msleep(100);
 
+#if !ENABLE_PCF_INITIATED_SESSION_RELEASE
     /* Test Bearer Remove */
     test_bearer_remove(qos_flow);
 
@@ -431,6 +472,7 @@
 
     /* Wait for PDU session resource modify complete */
     ogs_msleep(100);
+#endif
 
     /* Send UEContextReleaseRequest */
     sendbuf = testngap_build_ue_context_release_request(test_ue,

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/webui/server/models/profile.js -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/webui/server/models/profile.js Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/webui/server/models/subscriber.js -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/webui/server/models/subscriber.js Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/webui/src/components/Profile/Edit.js -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/webui/src/components/Profile/Edit.js Changed

@@ -114,6 +114,30 @@
         }
       }
     },
+    "subscriber_status": {
+      "type": "number",
+      "title": "Subscriber Status (TS 29.272 7.3.29)",
+      "enum":  0, 1 ,
+      "enumNames": "SERVICE_GRANTED", "OPERATOR_DETERMINED_BARRING",
+      "default": 0,
+    },
+    "operator_determined_barring": {
+      "type": "number",
+      "title": "Operator Determined Barring (TS 29.272 7.3.30)",
+      "enum":  0, 1, 2, 3, 4, 5, 6, 7, 8 ,
+      "enumNames": 
+        "(0) All Packet Oriented Services Barred",
+        "(1) Roamer Access HPLMN-AP Barred",
+        "(2) Roamer Access to VPLMN-AP Barred",
+        "(3) Barring of all outgoing calls",
+        "(4) Barring of all outgoing international calls",
+        "(5) Barring of all outgoing international calls except those directed to the home PLMN country",
+        "(6) Barring of all outgoing inter-zonal calls",
+        "(7) Barring of all outgoing inter-zonal calls except those directed to the home PLMN country",
+        "(8) Barring of all outgoing international calls except those directed to the home PLMN country and Barring of all outgoing inter-zonal calls"
+      ,
+      "default": 0,
+    },
     "slice": {
       "type": "array",
       "title": "Slice Configurations",
@@ -170,6 +194,10 @@
                   "enumNames": "IPv4", "IPv6", "IPv4v6",
                   "default": 3,
                 },
+                "lbo_roaming_allowed": {
+                  "type": "boolean",
+                  "title": "LBO Roaming Allowed",
+                },
                 "qos": {
                   "type": "object",
                   "title": "",
@@ -520,6 +548,9 @@
           "type": {
             classNames: "col-xs-4",
           },
+          "lbo_roaming_allowed": {
+            classNames: "col-xs-12",
+          },
           "qos": {
             classNames: "col-xs-12",
             "index": {

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/webui/src/components/Profile/View.js -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/webui/src/components/Profile/View.js Changed

@@ -172,6 +172,8 @@
   const imeisv = (profile || {}).imeisv;
   const security = ((profile || {}).security || {});
   const ambr = ((profile || {}).ambr || {});
+  const subscriber_status = (profile || {}).subscriber_status;
+  const operator_determined_barring = (profile || {}).operator_determined_barring;
   const slice_list = ((profile || {}).slice || );
 
   return (
@@ -260,6 +262,23 @@
                 <div className="sectioncolumn">
                   <div className="body">
                     <div className="left">
+                      <SecurityIcon/>
+                    </div>
+                    <div className="right">
+                      <div className="data">
+                        {subscriber_status == 0 ? ( "SERVICE_GRANTED (0)" ) : ( "OPERATOR_DETERMINED_BARRING (1)" )}
+                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>Subscriber Status (TS 29.272 7.3.29)</span>
+                      </div>
+                      <div className="data">
+                        {operator_determined_barring}
+                        <span style={{color:oc.gray5}}><KeyboardControlIcon/>Operator Determined Barring (TS 29.272 7.3.30)</span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div className="sectioncolumn">
+                  <div className="body">
+                    <div className="left">
                       <PdnIcon/>
                     </div>
                     <div className="right">
@@ -314,6 +333,7 @@
                   <div className="body" style={{color:oc.gray5}}>
                     <div className="large_data">DNN/APN</div>
                     <div className="medium_data">Type</div>
+                    <div className="medium_data">LBO</div>
                     <div className="small_data">5QI/QCI</div>
                     <div className="small_data">ARP</div>
                     <div className="medium_data">Capability</div>
@@ -332,6 +352,10 @@
                             session.type === 3 ? "IPv4v6" :
                             "Unknown"
                         }</div>
+                        <div className="medium_data">{
+                            session.lbo_roaming_allowed == true ? "Allowed" :
+                            "Not allowed"
+                        }</div>
                         <div className="small_data">{session.qos.index}</div>
                         <div className="small_data">{session.qos.arp.priority_level}</div>
                         <div className="medium_data">
@@ -411,6 +435,7 @@
                             <div className="body">
                               <div className="large_data"></div>
                               <div className="medium_data"></div>
+                              <div className="medium_data"></div>
                               <div className="small_data">{pcc_rule.qos.index}</div>
                               <div className="small_data">{pcc_rule.qos.arp.priority_level}</div>
                               <div className="medium_data">

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/webui/src/components/Subscriber/Edit.js -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/webui/src/components/Subscriber/Edit.js Changed

open5gs_2.7.5.4706.fc38.202507182026.tar.xz/webui/src/components/Subscriber/View.js -> open5gs_2.7.6.4730.0516.202507192026.tar.xz/webui/src/components/Subscriber/View.js Changed

@@ -359,6 +359,7 @@
                   <div className="body" style={{color:oc.gray5}}>
                     <div className="large_data">DNN/APN</div>
                     <div className="medium_data">Type</div>
+                    <div className="medium_data">LBO</div>
                     <div className="small_data">5QI/QCI</div>
                     <div className="small_data">ARP</div>
                     <div className="medium_data">Capability</div>
@@ -377,6 +378,10 @@
                             session.type === 3 ? "IPv4v6" :
                             "Unknown"
                         }</div>
+                        <div className="medium_data">{
+                            session.lbo_roaming_allowed == true ? "Allowed" :
+                            "Not allowed"
+                        }</div>
                         <div className="small_data">{session.qos.index}</div>
                         <div className="small_data">{session.qos.arp.priority_level}</div>
                         <div className="medium_data">
@@ -456,6 +461,7 @@
                             <div className="body">
                               <div className="large_data"></div>
                               <div className="medium_data"></div>
+                              <div className="medium_data"></div>
                               <div className="small_data">{pcc_rule.qos.index}</div>
                               <div className="small_data">{pcc_rule.qos.arp.priority_level}</div>
                               <div className="medium_data">

Changes of Revision 1121