change Host-Byte-Order to Network-Byte-Order in NextHopFiner.cpp

README.md

 ------------------------------------------------------------------------------
 
-                             OPENAIR-CN-5G
+                             OPENAIR-CN-6G
  An implementation of the 5G Core network by the OpenAirInterface community.
 
 ------------------------------------------------------------------------------

etc/config.yaml

-################################################################################
-# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The OpenAirInterface Software Alliance licenses this file to You under
-# the OAI Public License, Version 1.1  (the "License"); you may not use this file
-# except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.openairinterface.org/?page_id=698
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#-------------------------------------------------------------------------------
-# For more information about the OpenAirInterface (OAI) Software Alliance:
-#      contact@openairinterface.org
-################################################################################
-# OAI CN Configuration File
 log_level:
-  general: debug
+  general: info
+# If you enable registration, the other NFs will use the NRF discovery mechanism
 register_nf:
   general: no
   
 http_version: 2
 ############## SBI Interfaces
+### Each NF takes its local SBI interfaces and remote interfaces from here, unless it gets them using NRF discovery mechanisms
 nfs:
-  amf:
-    host: 192.168.10.100
-    sbi:
-      port: 8080
-      api_version: v1
-      interface_name: enp4s0f0np0
-    n2:
-      interface_name: enp4s0f0np0
-      port: 38412
   smf:
-    host: 192.168.10.100
+    host: 192.168.199.68
     sbi:
       port: 8080
       api_version: v1
-      interface_name: enp4s0f0np0
+      interface_name: eno1
     n4:
-      interface_name: enp4s0f0np0
+      interface_name: eno1
       port: 8805
   upf:
-    host: 192.168.10.10
+    host: 192.168.199.67
     sbi:
       port: 8080
       api_version: v1
-      interface_name: enp1s0f0np0
+      interface_name: eno1
     n3:
-      interface_name: enp1s0f1np1
+      interface_name: enp1s0f0np0
       port: 2152
     n4:
-      interface_name: enp1s0f0np0
+      interface_name: eno1
       port: 8805
     n6:
-      interface_name: eno1
-    n9:
-      interface_name: enp1s0f0np0
-      port: 2152
-  udm:
-    host: 192.168.10.100
-    sbi:
-      port: 8080
-      api_version: v1
-      interface_name: enp4s0f0np0
-  udr:
-    host: 192.168.10.100
-    sbi:
-      port: 8080
-      api_version: v1
-      interface_name: enp4s0f0np0
-  ausf:
-    host: 192.168.10.100
-    sbi:
-      port: 8080
-      api_version: v1
-      interface_name: enp4s0f0np0
-  nrf:
-    host: 192.168.10.100
-    sbi:
-      port: 8080
-      api_version: v1
-      interface_name: enp4s0f0np0
-#### Common for UDR and AMF
-database:
-  host: 192.168.10.100
-  user: test
-  type: mysql
-  password: test
-  database_name: oai_db
-  generate_random: true
-  connection_timeout: 300
-## general single_nssai configuration
+      interface_name: enp1s0f1np1
 snssais:
   - &embb_slice1
     sst: 1
   - &embb_slice2
     sst: 1
-    sd: 000001
+    sd: 000001 # in hex
   - &custom_slice
     sst: 222
-    sd: 00007B
+    sd: 00007B # in hex
 ############## NF-specific configuration
 amf:
   pid_directory: "/var/run"
   amf_name: "OAI-AMF"
+  # This really depends on if we want to keep the "mini" version or not
   support_features_options:
     enable_simple_scenario: no
     enable_nssf: no
     enable_smf_selection: yes
     use_external_udm: no
   relative_capacity: 30
-  statistics_timer_interval: 20
+  statistics_timer_interval: 20  #in seconds
   emergency_support: false
   served_guami_list:
     - mcc: 208
@@ -149,10 +85,11 @@ amf:
 smf:
   ue_mtu: 1500
   support_features:
-    use_local_subscription_info: yes
-    use_local_pcc_rules: yes
+    use_local_subscription_info: yes # Use infos from local_subscription_info or from UDM
+    use_local_pcc_rules: yes # Use infos from local_pcc_rules or from PCF
+  # we resolve from NRF, this is just to configure usage_reporting
   upfs:
-    - host: 192.168.10.10
+    - host: 192.168.199.67
       config:
         enable_usage_reporting: no
   ue_dns:
@@ -160,39 +97,40 @@ smf:
     primary_ipv6: "2001:4860:4860::8888"
     secondary_ipv4: "8.8.4.4"
     secondary_ipv6: "2001:4860:4860::8844"
+ # the DNN you configure here should be configured in "dnns"
   local_subscription_infos:
     - single_nssai:
         sst: 1
       dnn: "oai"
       qos_profile:
         5qi: 9
-        session_ambr_ul: "200Mbps"
-        session_ambr_dl: "400Mbps"
+        session_ambr_ul: "2000Mbps"
+        session_ambr_dl: "4000Mbps"
     - single_nssai:
         sst: 1
         sd: 1
       dnn: "oai.ipv4"
       qos_profile:
         5qi: 9
-        session_ambr_ul: "100Mbps"
-        session_ambr_dl: "200Mbps"
+        session_ambr_ul: "1000Mbps"
+        session_ambr_dl: "2000Mbps"
     - single_nssai:
         sst: 222
         sd: 123
       dnn: "default"
       qos_profile:
         5qi: 9
-        session_ambr_ul: "50Mbps"
-        session_ambr_dl: "100Mbps"
+        session_ambr_ul: "5000Mbps"
+        session_ambr_dl: "1000Mbps"
 upf:
   support_features:
-    enable_bpf_datapath: no
-    enable_qos: no
-    qdisc_scheduler: "htb"
-    enable_snat: no
-  remote_n6_gw: 192.168.199.1
+    enable_bpf_datapath: on   # If "on": BPF is used as datapath else simpleswitch is used, DEFAULT= off
+    enable_qos: on            # Only supported for BPF datapath. If "on" we use qdiscs to manage the QoS
+    qdisc_scheduler: "htb"    # This value is used only in case QoS is enabled 
+    enable_snat: no           # If "on": Source natting is done for UE, DEFAULT= off
+  remote_n6_gw: 192.168.20.100  
   smfs:
-    - host: 192.168.10.100
+    - host: 192.168.199.68
       config:
         enable_usage_reporting: no
   upf_info:

src/upf_app/SessionProgramManager.cpp

@@ -374,7 +374,7 @@ void SessionProgramManager::updateARPTableForN6(
     uint32_t ipnexremoteN6hop = (likely(is_little_endian())) ?
                                     htole32(getRemoteIP(upfn6IP, dnIP)) :
                                     getRemoteIP(upfn6IP, dnIP);
-
+    Logger::upf_app().info("-----is_little_endian() is %d \n",is_little_endian());
     auto remoteN6MAC = NextHopFinder::retrieveNextHopMAC(ipnexremoteN6hop);
 
     struct s_arp_mapping map_table;
@@ -387,11 +387,14 @@ void SessionProgramManager::updateARPTableForN6(
     // Logger::upf_app().error(
     //     "************************ max_arp_entries = %d", max_entries);
     // pPFCP_Session_LookupProgram->getArpTableMap()->resize(max_entries);
+  //  printf("-----------------upfn6Ip is %x\n",upfn6IP);
+    
     pPFCP_Session_LookupProgram->getArpTableMap()->update(
         upfn6IP, map_table, BPF_ANY);
   } catch (const std::exception& ex) {
     Logger::upf_app().error(
-        "Error: The ARP table was not updated for N6 Next HOP");
+        "Error: The ARP table was not updated for N6 Next HOP, -----upfn6IP is %x, \
+         dnIP is %x, %s\n",upfn6IP,dnIP,ex.what());
   }
 }
 

src/upf_app/helpers/NextHopFinder.cpp

@@ -38,9 +38,9 @@ uint32_t NextHopFinder::retrieveNextHopIP(uint32_t ipDest) {
   char* ipAddress     = inet_ntoa(addr);
 
   if (ipAddress) {
-    cmd = fmt::format("ip route get {} | awk '{print $3}'", ipAddress);
+    cmd = fmt::format("ip route get {} | awk '{{print $3}}'", ipAddress);
   }
-
+  
   uint32_t nextHopIp = htonl(inet_addr(CmdRunner::exec(cmd).c_str()));
 
   if (!nextHopIp) {
@@ -55,7 +55,7 @@ uint32_t NextHopFinder::retrieveNextHopIP(uint32_t ipDest) {
 
 ether_addr* NextHopFinder::retrieveNextHopMAC(uint32_t nextHopIp) {
   std::string cmd        = {};
-  struct in_addr addr    = {.s_addr = nextHopIp};
+  struct in_addr addr    = {.s_addr = htonl(nextHopIp)}; // 原本是没有做htonl转换的。
   char* ipAddress        = inet_ntoa(addr);
   std::string nextHopMac = {};
 
@@ -63,6 +63,7 @@ ether_addr* NextHopFinder::retrieveNextHopMAC(uint32_t nextHopIp) {
     cmd = fmt::format(
         "sudo arping -c 1 {} | awk '/from/ {{print $4}}'", ipAddress);
   }
+  Logger::upf_app().info("----nextHopIp is %x, cmd is %s\n",htonl(nextHopIp), cmd);
 
   nextHopMac = CmdRunner::exec(cmd);