Upgrade to latest component versions

code/config/containers/main/amf/Dockerfile

@@ -4,4 +4,4 @@ WORKDIR /amf
 RUN apt-get update && DEBIAN_FRONTEND=non-interactive apt-get install -qy --no-install-recommends --no-install-suggests \
     iproute2 tcpdump iputils-ping \
     && rm -rf /var/lib/apt/lists/*
-COPY --from=builder /go/src/free5gc/bin/amf /usr/local/bin/amf
+COPY --from=builder /go/src/5g-core-ntn/free5gc/bin/amf /usr/local/bin/amf

code/config/containers/main/amf/entrypoint.sh

@@ -1,2 +1,2 @@
 ip route add $GNB_ROUTE via $CLASSIFIER_IP
-amf --amfcfg amfcfg.yaml
+amf --config amfcfg.yaml

code/config/containers/main/ausf/Dockerfile

@@ -1,6 +1,6 @@
 FROM shynuu/sa-ntn:base as builder
 FROM debian:buster-slim
 WORKDIR /ausf
-COPY --from=builder /go/src/free5gc/bin/ausf /usr/local/bin/ausf
+COPY --from=builder /go/src/5g-core-ntn/free5gc/bin/ausf /usr/local/bin/ausf
 ENTRYPOINT ["ausf"]
 CMD ["-h"]

code/config/containers/main/nrf/Dockerfile

@@ -1,6 +1,6 @@
 FROM shynuu/sa-ntn:base AS builder
 FROM debian:buster-slim
 WORKDIR /nrf
-COPY --from=builder /go/src/free5gc/bin/nrf /usr/local/bin/nrf
+COPY --from=builder /go/src/5g-core-ntn/free5gc/bin/nrf /usr/local/bin/nrf
 ENTRYPOINT ["nrf"]
 CMD ["-h"]

code/config/containers/main/nssf/Dockerfile

@@ -1,6 +1,6 @@
 FROM shynuu/sa-ntn:base AS builder
 FROM debian:buster-slim
 WORKDIR /nssf
-COPY --from=builder /go/src/free5gc/bin/nssf /usr/local/bin/nssf
+COPY --from=builder /go/src/5g-core-ntn/free5gc/bin/nssf /usr/local/bin/nssf
 ENTRYPOINT ["nssf"]
 CMD ["-h"]

code/config/containers/main/ntnqof/Dockerfile

@@ -1,6 +1,6 @@
 FROM shynuu/sa-ntn:base AS builder
 FROM debian:buster-slim
 WORKDIR /ntnqof
-COPY --from=builder /go/src/5g-core-ntn/free5gc/bin/ntnqof /usr/local/bin/ntnqof
+COPY --from=builder /go/src/5g-core-ntn/bin/ntnqof /usr/local/bin/ntnqof
 ENTRYPOINT ["ntnqof"]
 CMD ["-h"]

code/config/containers/main/pcf/Dockerfile

@@ -1,6 +1,6 @@
 FROM shynuu/sa-ntn:base AS builder
 FROM debian:buster-slim
 WORKDIR /pcf
-COPY --from=builder /go/src/free5gc/bin/pcf /usr/local/bin/pcf
+COPY --from=builder /go/src/5g-core-ntn/free5gc/bin/pcf /usr/local/bin/pcf
 ENTRYPOINT ["pcf"]
 CMD ["-h"]

code/config/containers/main/qof/Dockerfile

@@ -1,6 +1,6 @@
 FROM shynuu/sa-ntn:base AS builder
 FROM debian:buster-slim
 WORKDIR /qof
-COPY --from=builder /go/src/5g-core-ntn/free5gc/bin/qof /usr/local/bin/qof
+COPY --from=builder /go/src/5g-core-ntn/bin/qof /usr/local/bin/qof
 COPY ./entrypoint.sh /qof/entrypoint.sh
 ENTRYPOINT [ "./entrypoint.sh" ]

code/config/containers/main/udm/Dockerfile

@@ -1,6 +1,6 @@
 FROM shynuu/sa-ntn:base AS builder
 FROM debian:buster-slim
 WORKDIR /udm
-COPY --from=builder /go/src/free5gc/bin/udm /usr/local/bin/udm
+COPY --from=builder /go/src/5g-core-ntn/free5gc/bin/udm /usr/local/bin/udm
 ENTRYPOINT ["udm"]
 CMD ["-h"]

code/config/containers/main/udr/Dockerfile

@@ -1,6 +1,6 @@
 FROM shynuu/sa-ntn:base AS builder
 FROM debian:buster-slim
 WORKDIR /udr
-COPY --from=builder /go/src/free5gc/bin/udr /usr/local/bin/udr
+COPY --from=builder /go/src/5g-core-ntn/free5gc/bin/udr /usr/local/bin/udr
 ENTRYPOINT ["udr"]
 CMD ["-h"]

code/config/containers/main/upf/Dockerfile

@@ -15,7 +15,7 @@ RUN mkdir /upf/results
 RUN apt-get update && DEBIAN_FRONTEND=non-interactive apt-get install -qy --no-install-recommends --no-install-suggests \
     libmnl0 libyaml-0-2 iproute2 iptables tcpdump iputils-ping \
     && rm -rf /var/lib/apt/lists/*
-COPY --from=builder /go/src/free5gc/NFs/upf/build/bin/free5gc-upfd /usr/local/bin/free5gc-upfd 
-COPY --from=builder /go/src/free5gc/NFs/upf/build/updk/src/third_party/libgtp5gnl/lib/libgtp5gnl.so.0 /usr/local/lib/libgtp5gnl.so.0
-COPY --from=builder /go/src/free5gc/NFs/upf/build/utlt_logger/liblogger.so /usr/local/lib/liblogger.so
+COPY --from=builder /go/src/5g-core-ntn/free5gc/NFs/upf/build/bin/free5gc-upfd /usr/local/bin/free5gc-upfd 
+COPY --from=builder /go/src/5g-core-ntn/free5gc/NFs/upf/build/updk/src/third_party/libgtp5gnl/lib/libgtp5gnl.so.0 /usr/local/lib/libgtp5gnl.so.0
+COPY --from=builder /go/src/5g-core-ntn/free5gc/NFs/upf/build/utlt_logger/liblogger.so /usr/local/lib/liblogger.so
 RUN ldconfig

code/config/containers/main/upf/entrypoint.sh

@@ -1,4 +1,4 @@
 RAN_IP=A
 CLASSIFIER_IP=A
 ip route add $RAN_IP via $CLASSIFIER_IP
-free5gc-upfd -f upfcfg.yaml
+free5gc-upfd -c upfcfg.yaml

code/config/containers/required/base/Dockerfile

@@ -4,9 +4,8 @@ RUN apt-get update && DEBIAN_FRONTEND=non-interactive apt-get install -qy --no-i
     && curl -sL https://deb.nodesource.com/setup_10.x | bash - \
     && rm -rf /var/lib/apt/lists/*
 
-RUN git -C /go/src clone --recursive -j $(nproc) https://github.com/free5gc/free5gc && \
-    git -C /go/src/free5gc checkout v3.0.6 --quiet
-WORKDIR /go/src/free5gc
+RUN git -C /go/src clone --recursive -b main -j $(nproc) https://github.com/shynuu/5g-core-ntn.git
+WORKDIR /go/src/5g-core-ntn/free5gc
 RUN make amf
 RUN make ausf
 RUN make nrf
@@ -16,9 +15,8 @@ RUN make udm
 RUN make udr
 RUN make upf
 RUN make nssf
+RUN make smf
 
-RUN git -C /go/src clone --recursive -j $(nproc) -b v2 https://github.com/shynuu/5g-core-ntn.git
-WORKDIR /go/src/5g-core-ntn/free5gc
+WORKDIR /go/src/5g-core-ntn
 RUN make ntnqof
-RUN make qof
-RUN make smf
+RUN make qof

code/config/services/amfcfg.yaml

@@ -1,29 +1,32 @@
 info:
-  version: 1.0.2
+  version: 1.0.3
   description: AMF initial local configuration
 
 configuration:
   amfName: AMF # the name of this AMF
-  ngapIpList:  # the IP list of N2 interfaces on this AMF
-    - 127.0.0.1
+  ngapIpList: # the IP list of N2 interfaces on this AMF
+    - 127.0.0.18
   sbi: # Service-based interface information
     scheme: http # the protocol for sbi (http or https)
     registerIPv4: 127.0.0.18 # IP used to register to NRF
-    bindingIPv4: 127.0.0.18  # IP used to bind the service
+    bindingIPv4: 127.0.0.18 # IP used to bind the service
     port: 8000 # port used to bind the service
+    tls: # the local path of TLS key
+      pem: config/TLS/amf.pem # AMF TLS Certificate
+      key: config/TLS/amf.key # AMF TLS Private key
   serviceNameList: # the SBI services provided by this AMF, refer to TS 29.518
     - namf-comm # Namf_Communication service
     - namf-evts # Namf_EventExposure service
-    - namf-mt   # Namf_MT service
-    - namf-loc  # Namf_Location service
-    - namf-oam  # OAM service
+    - namf-mt # Namf_MT service
+    - namf-loc # Namf_Location service
+    - namf-oam # OAM service
   servedGuamiList: # Guami (Globally Unique AMF ID) list supported by this AMF
     # <GUAMI> = <MCC><MNC><AMF ID>
     - plmnId: # Public Land Mobile Network ID, <PLMN ID> = <MCC><MNC>
         mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
         mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
       amfId: cafe00 # AMF identifier (3 bytes hex string, range: 000000~FFFFFF)
-  supportTaiList:  # the TAI (Tracking Area Identifier) list supported by this AMF
+  supportTaiList: # the TAI (Tracking Area Identifier) list supported by this AMF
     - plmnId: # Public Land Mobile Network ID, <PLMN ID> = <MCC><MNC>
         mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
         mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
@@ -37,61 +40,67 @@ configuration:
           sd: 010203 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF)
         - sst: 1 # Slice/Service Type (uinteger, range: 0~255)
           sd: 112233 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF)
-  supportDnnList:  # the DNN (Data Network Name) list supported by this AMF
+  supportDnnList: # the DNN (Data Network Name) list supported by this AMF
     - internet
   nrfUri: http://127.0.0.10:8000 # a valid URI of NRF
-  security:  # NAS security parameters
+  security: # NAS security parameters
     integrityOrder: # the priority of integrity algorithms
       - NIA2
       # - NIA0
     cipheringOrder: # the priority of ciphering algorithms
       - NEA0
       # - NEA2
-  networkName:  # the name of this core network
+  networkName: # the name of this core network
     full: free5GC
     short: free
   locality: area1 # Name of the location where a set of AMF, SMF and UPFs are located
   networkFeatureSupport5GS: # 5gs Network Feature Support IE, refer to TS 24.501
     enable: true # append this IE in Registration accept or not
+    length: 1 # IE content length (uinteger, range: 1~3)
     imsVoPS: 0 # IMS voice over PS session indicator (uinteger, range: 0~1)
     emc: 0 # Emergency service support indicator for 3GPP access (uinteger, range: 0~3)
     emf: 0 # Emergency service fallback indicator for 3GPP access (uinteger, range: 0~3)
     iwkN26: 0 # Interworking without N26 interface indicator (uinteger, range: 0~1)
     mpsi: 0 # MPS indicator (uinteger, range: 0~1)
     emcN3: 0 # Emergency service support indicator for Non-3GPP access (uinteger, range: 0~1)
     mcsi: 0 # MCS indicator (uinteger, range: 0~1)
-  t3502Value: 720  # timer value (seconds) at UE side
+  t3502Value: 720 # timer value (seconds) at UE side
   t3512Value: 3600 # timer value (seconds) at UE side
   non3gppDeregistrationTimerValue: 3240 # timer value (seconds) at UE side
   # retransmission timer for paging message
   t3513:
-    enable: true     # true or false
-    expireTime: 6s   # default is 6 seconds
+    enable: true # true or false
+    expireTime: 6s # default is 6 seconds
     maxRetryTimes: 4 # the max number of retransmission
   # retransmission timer for NAS Deregistration Request message
   t3522:
-    enable: true     # true or false
-    expireTime: 6s   # default is 6 seconds
+    enable: true # true or false
+    expireTime: 6s # default is 6 seconds
     maxRetryTimes: 4 # the max number of retransmission
   # retransmission timer for NAS Registration Accept message
   t3550:
-    enable: true     # true or false
-    expireTime: 6s   # default is 6 seconds
+    enable: true # true or false
+    expireTime: 6s # default is 6 seconds
     maxRetryTimes: 4 # the max number of retransmission
   # retransmission timer for NAS Authentication Request/Security Mode Command message
   t3560:
-    enable: true     # true or false
-    expireTime: 6s   # default is 6 seconds
+    enable: true # true or false
+    expireTime: 6s # default is 6 seconds
     maxRetryTimes: 4 # the max number of retransmission
   # retransmission timer for NAS Notification message
   t3565:
-    enable: true     # true or false
-    expireTime: 6s   # default is 6 seconds
+    enable: true # true or false
+    expireTime: 6s # default is 6 seconds
+    maxRetryTimes: 4 # the max number of retransmission
+  # retransmission timer for NAS Identity Request message
+  t3570:
+    enable: true # true or false
+    expireTime: 6s # default is 6 seconds
     maxRetryTimes: 4 # the max number of retransmission
 
 # the kind of log output
-  # debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic
-  # ReportCaller: enable the caller report or not, value: true or false
+# debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic
+# ReportCaller: enable the caller report or not, value: true or false
 logger:
   AMF:
     debugLevel: info
@@ -108,9 +117,3 @@ logger:
   Aper:
     debugLevel: info
     ReportCaller: false
-  PathUtil:
-    debugLevel: info
-    ReportCaller: false
-  OpenApi:
-    debugLevel: info
-    ReportCaller: false

code/config/services/ausfcfg.yaml

@@ -1,5 +1,5 @@
 info:
-  version: 1.0.0
+  version: 1.0.2
   description: AUSF initial local configuration
 
 configuration:
@@ -8,6 +8,9 @@ configuration:
     registerIPv4: 127.0.0.9 # IP used to register to NRF
     bindingIPv4: 127.0.0.9  # IP used to bind the service
     port: 8000 # Port used to bind the service
+    tls: # the local path of TLS key
+      pem: config/TLS/ausf.pem # AUSF TLS Certificate
+      key: config/TLS/ausf.key # AUSF TLS Private key
   serviceNameList: # the SBI services provided by this AUSF, refer to TS 29.509
     - nausf-auth # Nausf_UEAuthentication service
   nrfUri: http://127.0.0.10:8000 # a valid URI of NRF
@@ -17,17 +20,12 @@ configuration:
     - mcc: 123 # Mobile Country Code (3 digits string, digit: 0~9)
       mnc: 45  # Mobile Network Code (2 or 3 digits string, digit: 0~9)
   groupId: ausfGroup001 # ID for the group of the AUSF
+  eapAkaSupiImsiPrefix: false # including "imsi-" prefix or not when using the SUPI to do EAP-AKA' authentication
 
 # the kind of log output
-  # debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic
-  # ReportCaller: enable the caller report or not, value: true or false
+# debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic
+# ReportCaller: enable the caller report or not, value: true or false
 logger:
   AUSF:
     debugLevel: info
     ReportCaller: false
-  PathUtil:
-    debugLevel: info
-    ReportCaller: false
-  OpenApi:
-    debugLevel: info
-    ReportCaller: false

code/config/services/gnbcfg.yaml

@@ -1,13 +1,13 @@
-mcc: '208'          # Mobile Country Code value
-mnc: '93'           # Mobile Network Code value (2 or 3 digits)
+mcc: "208" # Mobile Country Code value
+mnc: "93" # Mobile Network Code value (2 or 3 digits)
 
-nci: '0x000000010'  # NR Cell Identity (36-bit)
-idLength: 32        # NR gNB ID length in bits [22...32]
-tac: 1              # Tracking Area Code
+nci: "0x000000010" # NR Cell Identity (36-bit)
+idLength: 32 # NR gNB ID length in bits [22...32]
+tac: 1 # Tracking Area Code
 
-linkIp: 127.0.0.1   # gNB's local IP address for Radio Link Simulation (Usually same with local IP)
-ngapIp: 127.0.0.1   # gNB's local IP address for N2 Interface (Usually same with local IP)
-gtpIp: 127.0.0.1    # gNB's local IP address for N3 Interface (Usually same with local IP)
+linkIp: 127.0.0.1 # gNB's local IP address for Radio Link Simulation (Usually same with local IP)
+ngapIp: 127.0.0.1 # gNB's local IP address for N2 Interface (Usually same with local IP)
+gtpIp: 127.0.0.1 # gNB's local IP address for N3 Interface (Usually same with local IP)
 
 # List of AMF address information
 amfConfigs:
@@ -20,4 +20,4 @@ slices:
     sd: 0x010203
 
 # Indicates whether or not SCTP stream number errors should be ignored.
-ignoreStreamIds: true
+ignoreStreamIds: true

code/config/services/nrfcfg.yaml

@@ -1,5 +1,5 @@
 info:
-  version: 1.0.0
+  version: 1.0.1
   description: NRF initial local configuration
 
 configuration:
@@ -10,6 +10,9 @@ configuration:
     registerIPv4: 127.0.0.10 # IP used to serve NFs or register to another NRF
     bindingIPv4: 127.0.0.10  # IP used to bind the service
     port: 8000 # port used to bind the service
+    tls: # the local path of TLS key
+      pem: config/TLS/nrf.pem # NRF TLS Certificate
+      key: config/TLS/nrf.key # NRF TLS Private key
   DefaultPlmnId:
     mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
     mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
@@ -18,18 +21,9 @@ configuration:
     - nnrf-disc # Nnrf_NFDiscovery service
 
 # the kind of log output
-  # debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic
-  # ReportCaller: enable the caller report or not, value: true or false
+# debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic
+# ReportCaller: enable the caller report or not, value: true or false
 logger:
   NRF:
     debugLevel: info
     ReportCaller: false
-  PathUtil:
-    debugLevel: info
-    ReportCaller: false
-  OpenApi:
-    debugLevel: info
-    ReportCaller: false
-  MongoDBLibrary:
-    debugLevel: info
-    ReportCaller: false