Merge branch 'herlesupreeth:master' into master

Robin-Rhee · web-flow · commit b4a9dd6bf5df · 2026-02-24T16:46:48.000+08:00
diff --git a/custom_deployments/open5gs_hss_cx/hss/hss.yaml b/custom_deployments/open5gs_hss_cx/hss/hss.yaml
@@ -11,3 +11,7 @@ global:
 hss:
     freeDiameter: /open5gs/install/etc/freeDiameter/hss.conf
     sms_over_ims: "sip:smsc.IMS_DOMAIN:7090"
+    metrics:
+      server:
+        - address: HSS_IP
+          port: 9091
diff --git a/custom_deployments/open5gs_hss_cx/hss/hss_init.sh b/custom_deployments/open5gs_hss_cx/hss/hss_init.sh
@@ -54,6 +54,7 @@ sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/make_certs.sh
 sed -i 's|MONGO_IP|'$MONGO_IP'|g' install/etc/open5gs/hss.yaml
 sed -i 's|IMS_DOMAIN|'$IMS_DOMAIN'|g' install/etc/open5gs/hss.yaml
 sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/hss.yaml
+sed -i 's|HSS_IP|'$HSS_IP'|g' install/etc/open5gs/hss.yaml
 
 # Generate TLS certificates
 ./install/etc/freeDiameter/make_certs.sh install/etc/freeDiameter
diff --git a/custom_deployments/open5gs_hss_cx/icscf/icscf_init.sh b/custom_deployments/open5gs_hss_cx/icscf/icscf_init.sh
@@ -96,7 +96,6 @@ sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' /etc/kamailio_icscf/icscf.xml
 sed -i 's|HSS_BIND_PORT|'$HSS_BIND_PORT'|g' /etc/kamailio_icscf/icscf.xml
 sed -i 's|ICSCF_BIND_PORT|'$ICSCF_BIND_PORT'|g' /etc/kamailio_icscf/icscf.xml
 
-mkdir -p /var/run/kamailio_icscf
 rm -f /kamailio_icscf.pid
 exec kamailio -f /etc/kamailio_icscf/kamailio_icscf.cfg -P /kamailio_icscf.pid -DD -E -e $@
 
diff --git a/custom_deployments/open5gs_hss_cx/scscf/scscf_init.sh b/custom_deployments/open5gs_hss_cx/scscf/scscf_init.sh
@@ -83,7 +83,6 @@ sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' /etc/kamailio_scscf/scscf.xml
 sed -i 's|HSS_BIND_PORT|'$HSS_BIND_PORT'|g' /etc/kamailio_scscf/scscf.xml
 sed -i 's|SCSCF_BIND_PORT|'$SCSCF_BIND_PORT'|g' /etc/kamailio_scscf/scscf.xml
 
-mkdir -p /var/run/kamailio_scscf
 rm -f /kamailio_scscf.pid
 exec kamailio -f /etc/kamailio_scscf/kamailio_scscf.cfg -P /kamailio_scscf.pid -DD -E -e $@
 
diff --git a/hss/hss.yaml b/hss/hss.yaml
@@ -10,3 +10,7 @@ global:
 
 hss:
     freeDiameter: /open5gs/install/etc/freeDiameter/hss.conf
+    metrics:
+      server:
+        - address: HSS_IP
+          port: 9091
diff --git a/hss/hss_init.sh b/hss/hss_init.sh
@@ -46,6 +46,7 @@ sed -i 's|LD_LIBRARY_PATH|'$LD_LIBRARY_PATH'|g' install/etc/freeDiameter/hss.con
 sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/make_certs.sh
 sed -i 's|MONGO_IP|'$MONGO_IP'|g' install/etc/open5gs/hss.yaml
 sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/hss.yaml
+sed -i 's|HSS_IP|'$HSS_IP'|g' install/etc/open5gs/hss.yaml
 
 # Generate TLS certificates
 ./install/etc/freeDiameter/make_certs.sh install/etc/freeDiameter
diff --git a/ims_base/Dockerfile b/ims_base/Dockerfile
@@ -38,8 +38,8 @@ RUN apt-get update && \
 
 # Fetch Kamailio code
 RUN mkdir -p /usr/local/src/ && cd /usr/local/src/ && \
-	git clone https://github.com/herlesupreeth/kamailio && \
-	cd kamailio && git checkout fix_register_refresh2
+	git clone https://github.com/kamailio/kamailio && \
+	cd kamailio && git checkout 6ca2cf813d38f17a24307def8a0ddff1cb9b0910
 
 # Build and Install Kamailio
 RUN cd /usr/local/src/kamailio && make cfg
diff --git a/metrics/metrics_init.sh b/metrics/metrics_init.sh
@@ -41,5 +41,7 @@ sed -i 's|SMF_IP|'$SMF_IP'|g' /config/prometheus.yml
 sed -i 's|MME_IP|'$MME_IP'|g' /config/prometheus.yml
 sed -i 's|PCF_IP|'$PCF_IP'|g' /config/prometheus.yml
 sed -i 's|UPF_IP|'$UPF_IP'|g' /config/prometheus.yml
+sed -i 's|HSS_IP|'$HSS_IP'|g' /config/prometheus.yml
+sed -i 's|PCRF_IP|'$PCRF_IP'|g' /config/prometheus.yml
 
 exec ./prometheus --config.file=/config/prometheus.yml $@
diff --git a/metrics/prometheus.yml b/metrics/prometheus.yml
@@ -20,3 +20,9 @@ scrape_configs:
   - job_name: 'mme'
     static_configs:
       - targets: ['MME_IP:9091']
+  - job_name: 'pcrf'
+    static_configs:
+      - targets: ['PCRF_IP:9091']
+  - job_name: 'hss'
+    static_configs:
+      - targets: ['HSS_IP:9091']
diff --git a/osmoepdg/eap-aka.conf b/osmoepdg/eap-aka.conf
@@ -5,6 +5,4 @@ eap-aka {
     load = yes
 
     request_identity = no
-
 }
-
diff --git a/osmoepdg/osmoepdg_init.sh b/osmoepdg/osmoepdg_init.sh
@@ -36,6 +36,7 @@ mkdir -p /wireshark_keys
 cp /mnt/osmoepdg/osmo-epdg.config /etc/osmocom
 cp /mnt/osmoepdg/swanctl/swanctl.conf /etc/swanctl/swanctl.conf
 cp /mnt/osmoepdg/strongswan.d/charon/kernel-netlink.conf /etc/strongswan.d/charon/kernel-netlink.conf
+cp /mnt/osmoepdg/strongswan.d/charon.conf /etc/strongswan.d/charon.conf
 cp /mnt/osmoepdg/eap-aka.conf /etc/strongswan.d/charon/eap-aka.conf
 cp /mnt/osmoepdg/save-keys.conf /etc/strongswan.d/charon/save-keys.conf
 
diff --git a/osmoepdg/strongswan.d/charon.conf b/osmoepdg/strongswan.d/charon.conf
@@ -0,0 +1,4 @@
+charon {
+    # Only EAP-AKA authentication is supported, so we can force it to be used for all EAP authentication requests.
+    force_eap_only_authentication = yes
+}
diff --git a/pcrf/pcrf.yaml b/pcrf/pcrf.yaml
@@ -10,3 +10,6 @@ global:
 
 pcrf:
     freeDiameter: /open5gs/install/etc/freeDiameter/pcrf.conf
+    server:
+      - address: PCRF_IP
+        port: 9091
diff --git a/pcrf/pcrf_init.sh b/pcrf/pcrf_init.sh
@@ -47,6 +47,7 @@ sed -i 's|PCSCF_IP|'$PCSCF_IP'|g' install/etc/freeDiameter/pcrf.conf
 sed -i 's|PCSCF_BIND_PORT|'$PCSCF_BIND_PORT'|g' install/etc/freeDiameter/pcrf.conf
 sed -i 's|LD_LIBRARY_PATH|'$LD_LIBRARY_PATH'|g' install/etc/freeDiameter/pcrf.conf
 sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/make_certs.sh
+sed -i 's|PCRF_IP|'$PCRF_IP'|g' install/etc/open5gs/pcrf.yaml
 
 # Generate TLS certificates
 ./install/etc/freeDiameter/make_certs.sh install/etc/freeDiameter

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,4 @@ eap-aka {`
`5`	`5`	`load = yes`
`6`	`6`
`7`	`7`	`request_identity = no`
`8`		`-`
`9`	`8`	`}`
`10`		`-`