From 693f7cf2b20f727d3ea89b355887f6003f01d6b1 Mon Sep 17 00:00:00 2001 From: blackcat Date: Tue, 27 Aug 2024 10:45:39 +0000 Subject: [PATCH] fix: changing tngf network mode to host --- config/tngfcfg.yaml | 8 ++++---- docker-compose-build.yaml | 11 ++--------- docker-compose.yaml | 11 ++--------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/config/tngfcfg.yaml b/config/tngfcfg.yaml index 3cd079b..bf6ed12 100644 --- a/config/tngfcfg.yaml +++ b/config/tngfcfg.yaml @@ -26,13 +26,13 @@ configuration: AMFSCTPAddresses: # the IP list of N2 interfaces (SCTP) on AMF when using NGAP - IP: - - amf.free5gc.org + - 10.100.200.16 Port: 38412 NASTCPPort: 20000 # TCP port which the NAS listens on # --- Bind Interfaces --- - IKEBindAddress: 10.100.200.16 # IP address of Nwu interface (IKE) on this TNGF - RadiusBindAddress: 10.100.200.16 # IP address of Nwu interface (IKE) on this TNGF + IKEBindAddress: 192.168.1.103 # IP address of Nwu interface (IKE) on this TNGF + RadiusBindAddress: 192.168.1.103 # IP address of Nwu interface (IKE) on this TNGF IPSecInterfaceAddress: 10.0.0.1 # IP address of IPSec virtual interface (IPsec tunnel enpoint on this TNGF) IPSecTunnelAddress: 10.0.0.1 # Tunnel IP address of XFRM interface on this TNGF UEIPAddressRange: 10.0.0.0/24 # IP address allocated to UE in IPSec tunnel @@ -40,7 +40,7 @@ configuration: XFRMInterfaceID: 1 # XFRM interface if_id for IPSec routing (Any value except to 0, default value is 7 if not defined) # --- N3 Interfaces --- - GTPBindAddress: 10.100.200.16 # IP address of N3 interface (GTP) on this TNGF + GTPBindAddress: 192.168.1.103 # IP address of N3 interface (GTP) on this TNGF FQDN: tngf.free5gc.org # FQDN of this TNGF diff --git a/docker-compose-build.yaml b/docker-compose-build.yaml index 670188e..a7fc2e1 100644 --- a/docker-compose-build.yaml +++ b/docker-compose-build.yaml @@ -69,6 +69,7 @@ services: GIN_MODE: release networks: privnet: + ipv4_address: 10.100.200.16 aliases: - amf.free5gc.org depends_on: @@ -268,15 +269,7 @@ services: GIN_MODE: release cap_add: - NET_ADMIN - networks: - privnet: - ipv4_address: 10.100.200.16 - aliases: - - tngf.free5gc.org - ports: - - "1812:1812/udp" - - "500:500/udp" - - "4500:4500/udp" + network_mode: host depends_on: - free5gc-amf - free5gc-smf diff --git a/docker-compose.yaml b/docker-compose.yaml index aec2bdd..78a9db8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -60,6 +60,7 @@ services: GIN_MODE: release networks: privnet: + ipv4_address: 10.100.200.16 aliases: - amf.free5gc.org depends_on: @@ -231,15 +232,7 @@ services: GIN_MODE: release cap_add: - NET_ADMIN - networks: - privnet: - ipv4_address: 10.100.200.16 - aliases: - - tngf.free5gc.org - ports: - - "1812:1812/udp" - - "500:500/udp" - - "4500:4500/udp" + network_mode: host depends_on: - free5gc-amf - free5gc-smf