Merge remote-tracking branch 'origin/refactor-nas-config' into integration_2024_w31

NOTICE.md

@@ -4,15 +4,6 @@ For more details of the license, refer to [LICENSE](LICENSE) file in the same di
 
 However, the source code also contains third party software that is acknowledged here for reference.
 
-## Credits for LFDS user space source code located in folder openair2/UTILS/LFDS/ ##
-
-See on [liblfds website](https://liblfds.org/) the license section.
-
-<pre>
-"There is no license. You are free to use this software in any way, for any purpose. Go forth and create wealth!
-If however for legal reasons a licence is required, the license of your choice will be granted."
-</pre>
-
 ## Credits for source code common/utils/collection/queue.h: ##
 
 The Regents of the University of California: BSD 3-Clause Licence.

cmake_targets/build_oai

@@ -85,7 +85,7 @@ Options:
 --RU
   Makes the OAI RRU
 --UE
-   Makes the UE specific parts (ue_ip, usim, nvram) from the given configuration file
+   Makes the UE specific parts (usim, nvram) from the given configuration file
 --nrUE
   Makes the NR UE softmodem
 --UE-conf-nvram [configuration file]
@@ -271,9 +271,6 @@ function main() {
        --UE-gen-nvram)
             gen_nvram_path=$(readlink -f "$2")
             shift 2;;
-       --UE-ip)
-            TARGET_LIST="$TARGET_LIST ue_ip"
-            shift;;
        -w | --hardware)
             case "$2" in
                 "USRP" | "BLADERF" | "LMSSDR" | "IRIS")

cmake_targets/tools/build_helper

@@ -171,10 +171,6 @@ clean_kernel() {
     $SUDO iptables -t filter -F
     $SUDO iptables -t raw -F
     echo_info "Flushed iptables"
-    $SUDO rmmod nasmesh > /dev/null 2>&1
-    $SUDO rmmod oai_nw_drv  > /dev/null 2>&1
-    $SUDO rmmod ue_ip > /dev/null 2>&1
-    echo_info "removed drivers from kernel"
 }
 
 clean_all_files() {

cmake_targets/tools/init_nas_nos1

-#!/bin/bash
-
-#/*
-# * 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
-# */
-
-# file init_nas_nos1
-# brief loads the nasmesh module and sets up the radio bearers (used to provide ip interface without S1 interface)
-# author Florian Kaltenberger
-#
-#######################################
-
-load_module() {
-  mod_name=${1##*/}
-  mod_name=${mod_name%.*}
-  if awk "/$mod_name/ {found=1 ;exit} END {if (found!=1) exit 1}" /proc/modules
-    then
-      echo "module $mod_name already loaded: I remove it first"
-      sudo rmmod $mod_name
-  fi
-  echo loading $mod_name
-  sudo insmod $1
-}
-
-load_module $OPENAIR_DIR/cmake_targets/ran_build/build/nasmesh.ko
-
-if [ "$1" = "eNB" ]; then 
-     echo "bring up oai0 interface for enb"
-     sudo ifconfig oai0 10.0.1.1 netmask 255.255.255.0 broadcast 10.0.1.255
-     $OPENAIR_DIR/cmake_targets/ran_build/build/rb_tool -a -c0 -i0 -z0 -s 10.0.1.1 -t 10.0.1.2 -r 1
-else
-    if [ "$1" = "UE" ]; then 
-       echo "bring up oai0 interface for UE"
-       sudo ifconfig oai0 10.0.1.2 netmask 255.255.255.0 broadcast 10.0.1.255
-       $OPENAIR_DIR/cmake_targets/ran_build/build/rb_tool -a -c0 -i0 -z0 -s 10.0.1.2 -t 10.0.1.1 -r 1
-    fi
-fi  

cmake_targets/tools/init_nas_s1

-#!/bin/bash
-
-#WARNING: this file may not work properly, be sure to know what you
-#do when using it
-
-#/*
-# * 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
-# */
-
-################################################################################
-# file init_nas_s1
-# brief loads the ue_ip module and sets up IP for the UE
-# you may want to edit it to fit your settings (replace oip0 by oipX for
-# instance)
-# author Florian Kaltenberger
-#
-#######################################
-
-LTEIF=oip1
-#OPENAIR_DIR=/home/oai/svn-oai/openair4G
-
-load_module() {
-  mod_name=${1##*/}
-  mod_name=${mod_name%.*}
-  if awk "/$mod_name/ {found=1 ;exit} END {if (found!=1) exit 1}" /proc/modules
-    then
-      echo "module $mod_name already loaded: I remove it first"
-      sudo rmmod $mod_name
-  fi
-  echo loading $mod_name
-  sudo insmod $1
-}
-
-load_module ../ran_build/build/ue_ip.ko
-
-if [ "$1" = "UE" ]; then
-  echo "bring up $LTEIF interface for UE"
-  sudo ifconfig $LTEIF up
-fi
-
-sudo ip route flush cache
-sleep 1
-sudo sysctl -w net.ipv4.conf.all.log_martians=1
-echo "Disabling reverse path filtering"
-sudo sysctl -w net.ipv4.conf.all.rp_filter=0
-sudo ip route flush cache
-
-# Check table 200 lte in /etc/iproute2/rt_tables
-fgrep lte /etc/iproute2/rt_tables  > /dev/null 
-if [ $? -ne 0 ]; then
-    echo "200 lte " >> /etc/iproute2/rt_tables
-fi
-sudo ip rule add fwmark 1 table lte
-sudo ip route add default dev $LTEIF table lte

common/config/DOC/config/rtusage.md

@@ -68,7 +68,6 @@ To get help on supported parameters you can use specific options:
     --worker-config: two option for worker 'WORKER_DISABLE' or 'WORKER_ENABLE'
     --nbiot-disable: disable nb-iot, even if defined in config
     --noS1: Disable s1 interface
-    --nokrnmod: (noS1 only): Use tun instead of namesh module
 --------------------------------------------------------------------
 
 [LIBCONFIG] (root): 4/4 parameters successfully set, (4 to default value)

common/utils/CMakeLists.txt

@@ -13,6 +13,6 @@ add_subdirectory(T)
 add_subdirectory(nr)
 add_subdirectory(LOG)
 add_subdirectory(threadPool)
-add_library(utils utils.c system.c time_meas.c time_stat.c)
+add_library(utils utils.c system.c time_meas.c time_stat.c tun_if.c)
 target_include_directories(utils PUBLIC .)
 target_link_libraries(utils PRIVATE ${T_LIB})

common/utils/tun_if.c

+/*
+ * 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
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <linux/ipv6.h>
+#include <linux/if_tun.h>
+#include <linux/netlink.h>
+
+#include "tun_if.h"
+#include "common/platform_constants.h"
+#include "common/utils/LOG/log.h"
+#include "common/utils/system.h"
+
+int nas_sock_fd[MAX_MOBILES_PER_ENB * 2]; // Allocated for both LTE UE and NR UE.
+int nas_sock_mbms_fd;
+
+static int tun_alloc(char *dev)
+{
+  struct ifreq ifr;
+  int fd, err;
+
+  if ((fd = open("/dev/net/tun", O_RDWR)) < 0) {
+    LOG_E(UTIL, "failed to open /dev/net/tun\n");
+    return -1;
+  }
+
+  memset(&ifr, 0, sizeof(ifr));
+  /* Flags: IFF_TUN   - TUN device (no Ethernet headers)
+   *        IFF_TAP   - TAP device
+   *
+   *        IFF_NO_PI - Do not provide packet information
+   */
+  ifr.ifr_flags = IFF_TUN | IFF_NO_PI;
+
+  if (*dev)
+    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name) - 1);
+
+  if ((err = ioctl(fd, TUNSETIFF, (void *)&ifr)) < 0) {
+    close(fd);
+    return err;
+  }
+
+  strcpy(dev, ifr.ifr_name);
+  return fd;
+}
+
+int tun_init_mbms(char *ifprefix, int id)
+{
+  int ret;
+  char ifname[64];
+
+  sprintf(ifname, "%s%d", ifprefix, id);
+  nas_sock_mbms_fd = tun_alloc(ifname);
+
+  if (nas_sock_mbms_fd == -1) {
+    LOG_E(UTIL, "Error opening mbms socket %s (%d:%s)\n", ifname, errno, strerror(errno));
+    exit(1);
+  }
+
+  LOG_D(UTIL, "Opened socket %s with fd %d\n", ifname, nas_sock_mbms_fd);
+  ret = fcntl(nas_sock_mbms_fd, F_SETFL, O_NONBLOCK);
+
+  if (ret == -1) {
+    LOG_E(UTIL, "Error fcntl (%d:%s)\n", errno, strerror(errno));
+    return 0;
+  }
+
+  struct sockaddr_nl nas_src_addr = {0};
+  nas_src_addr.nl_family = AF_NETLINK;
+  nas_src_addr.nl_pid = 1;
+  nas_src_addr.nl_groups = 0; /* not in mcast groups */
+  ret = bind(nas_sock_mbms_fd, (struct sockaddr *)&nas_src_addr, sizeof(nas_src_addr));
+
+  return 1;
+}
+
+int tun_init(const char *ifprefix, int num_if, int id)
+{
+  int ret;
+  char ifname[64];
+
+  int begx = (id == 0) ? 0 : id - 1;
+  int endx = (id == 0) ? num_if : id;
+  for (int i = begx; i < endx; i++) {
+    sprintf(ifname, "%s%d", ifprefix, i + 1);
+    nas_sock_fd[i] = tun_alloc(ifname);
+
+    if (nas_sock_fd[i] == -1) {
+      LOG_E(UTIL, "Error opening socket %s (%d:%s)\n", ifname, errno, strerror(errno));
+      return 0;
+    }
+
+    LOG_I(UTIL, "Opened socket %s with fd nas_sock_fd[%d]=%d\n", ifname, i, nas_sock_fd[i]);
+    ret = fcntl(nas_sock_fd[i], F_SETFL, O_NONBLOCK);
+
+    if (ret == -1) {
+      LOG_E(UTIL, "Error fcntl (%d:%s)\n", errno, strerror(errno));
+
+      return 0;
+    }
+  }
+
+  return 1;
+}
+
+/*
+ * \brief set a genneric interface parameter
+ * \param ifn the name of the interface to modify
+ * \param if_addr the address that needs to be modified
+ * \param operation one of SIOCSIFADDR (set interface address), SIOCSIFNETMASK
+ *   (set network mask), SIOCSIFBRDADDR (set broadcast address), SIOCSIFFLAGS
+ *   (set flags)
+ * \return true on success, false otherwise
+ */
+static bool setInterfaceParameter(int sock_fd, const char *ifn, int af, const char *if_addr, int operation)
+{
+  DevAssert(af == AF_INET || af == AF_INET6);
+  struct ifreq ifr = {0};
+  strncpy(ifr.ifr_name, ifn, sizeof(ifr.ifr_name));
+  struct in6_ifreq ifr6 = {0};
+
+  void *ioctl_opt = NULL;
+  if (af == AF_INET) {
+    struct sockaddr_in addr = {.sin_family = AF_INET};
+    int ret = inet_pton(af, if_addr, &addr.sin_addr);
+    if (ret != 1) {
+      LOG_E(OIP, "inet_pton(): cannot convert %s to IPv4 network address\n", if_addr);
+      return false;
+    }
+    memcpy(&ifr.ifr_ifru.ifru_addr,&addr,sizeof(struct sockaddr_in));
+    ioctl_opt = &ifr;
+  } else {
+    struct sockaddr_in6 addr6 = {.sin6_family = AF_INET6};
+    int ret = inet_pton(af, if_addr, &addr6.sin6_addr);
+    if (ret != 1) {
+      LOG_E(OIP, "inet_pton(): cannot convert %s to IPv6 network address\n", if_addr);
+      return false;
+    }
+    memcpy(&ifr6.ifr6_addr, &addr6.sin6_addr, sizeof(struct in6_addr));
+    // we need to get the if index to put it into ifr6
+    if (ioctl(sock_fd, SIOGIFINDEX, &ifr) < 0) {
+      LOG_E(OIP, "ioctl() failed: errno %d, %s\n", errno, strerror(errno));
+      return false;
+    }
+    ifr6.ifr6_ifindex = ifr.ifr_ifindex;
+    ifr6.ifr6_prefixlen = 64;
+    ioctl_opt = &ifr6;
+  }
+
+  bool success = ioctl(sock_fd, operation, ioctl_opt) == 0;
+  if (!success)
+    LOG_E(OIP, "Setting operation %d for %s: ioctl call failed: %d, %s\n", operation, ifn, errno, strerror(errno));
+  return success;
+}
+
+/*
+ * \brief bring interface up (up != 0) or down (up == 0)
+ */
+typedef enum { INTERFACE_DOWN, INTERFACE_UP } if_action_t;
+static bool change_interface_state(int sock_fd, const char *ifn, if_action_t if_action)
+{
+  const char* action = if_action == INTERFACE_DOWN ? "DOWN" : "UP";
+
+  struct ifreq ifr = {0};
+  strncpy(ifr.ifr_name, ifn, sizeof(ifr.ifr_name));
+  /* get flags of this interface: see netdevice(7) */
+  bool success = ioctl(sock_fd, SIOCGIFFLAGS, (caddr_t)&ifr) == 0;
+  if (!success)
+    goto fail_interface_state;
+
+  if (if_action == INTERFACE_UP) {
+    ifr.ifr_flags |= IFF_UP | IFF_NOARP | IFF_POINTOPOINT;
+    ifr.ifr_flags &= ~IFF_MULTICAST;
+  } else {
+    ifr.ifr_flags &= ~IFF_UP;
+  }
+
+  success = ioctl(sock_fd, SIOCSIFFLAGS, (caddr_t)&ifr) == 0;
+  if (!success)
+    goto fail_interface_state;
+  return true;
+
+fail_interface_state:
+  LOG_E(OIP, "Bringing interface %s for %s: ioctl call failed: %d, %s\n", action, ifn, errno, strerror(errno));
+  return false;
+}
+
+// non blocking full configuration of the interface (address, and the two lest octets of the address)
+bool tun_config(int interface_id, const char *ipv4, const char *ipv6, const char *ifpref)
+{
+  char interfaceName[IFNAMSIZ];
+  snprintf(interfaceName, sizeof(interfaceName), "%s%d", ifpref, interface_id);
+
+  AssertFatal(ipv4 != NULL || ipv6 != NULL, "need to have IP address, but none given\n");
+
+  int sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
+  if (sock_fd < 0) {
+    LOG_E(UTIL, "Failed creating socket for interface management: %d, %s\n", errno, strerror(errno));
+    return false;
+  }
+
+  change_interface_state(sock_fd, interfaceName, INTERFACE_DOWN);
+  bool success = true;
+  if (ipv4 != NULL)
+    success = setInterfaceParameter(sock_fd, interfaceName, AF_INET, ipv4, SIOCSIFADDR);
+  // set the machine network mask for IPv4
+  if (success && ipv4 != NULL)
+    success = setInterfaceParameter(sock_fd, interfaceName, AF_INET, "255.255.255.0", SIOCSIFNETMASK);
+
+  if (ipv6 != NULL) {
+    // for setting the IPv6 address, we need an IPv6 socket. For setting IPv4,
+    // we need an IPv4 socket. So do all operations using IPv4 socket, except
+    // for setting the IPv6
+    int sock_fd = socket(AF_INET6, SOCK_DGRAM, 0);
+    if (sock_fd < 0) {
+      LOG_E(UTIL, "Failed creating socket for interface management: %d, %s\n", errno, strerror(errno));
+      success = false;
+    }
+    success = success && setInterfaceParameter(sock_fd, interfaceName, AF_INET6, ipv6, SIOCSIFADDR);
+    close(sock_fd);
+  }
+
+  if (success)
+    success = change_interface_state(sock_fd, interfaceName, INTERFACE_UP);
+
+  if (success)
+    LOG_I(OIP, "Interface %s successfully configured, IPv4 %s, IPv6 %s\n", interfaceName, ipv4, ipv6);
+  else
+    LOG_E(OIP, "Interface %s couldn't be configured (IPv4 %s, IPv6 %s)\n", interfaceName, ipv4, ipv6);
+
+  close(sock_fd);
+  return success;
+}
+
+void setup_ue_ipv4_route(int interface_id, const char *ipv4, const char *ifpref)
+{
+  int table_id = interface_id - 1 + 10000;
+  char interfaceName[IFNAMSIZ];
+  snprintf(interfaceName, sizeof(interfaceName), "%s%d", ifpref, interface_id);
+
+  char command_line[500];
+  int res = sprintf(command_line,
+                    "ip rule add from %s/32 table %d && "
+                    "ip rule add to %s/32 table %d && "
+                    "ip route add default dev %s table %d",
+                    ipv4,
+                    table_id,
+                    ipv4,
+                    table_id,
+                    interfaceName,
+                    table_id);
+
+  if (res < 0) {
+    LOG_E(UTIL, "Could not create ip rule/route commands string\n");
+    return;
+  }
+  background_system(command_line);
+}
+

openair1/SIMULATION/ETH_TRANSPORT/extern.h → common/utils/tun_if.h

@@ -19,42 +19,45 @@
  *      contact@openairinterface.org
  */
 
-/*! \file extern.h
- *  \brief specifies the extern variables for phy emulation
- *  \author Navid Nikaein and Raymomd Knopp and Hicham Anouar
- *  \date 2011
- *  \version 1.1
- *  \company Eurecom
- *  \email: navid.nikaein@eurecom.fr
+#ifndef TUN_IF_H_
+#define TUN_IF_H_
+
+#include <stdbool.h>
+
+/* TODO: doc */
+int tun_init(const char *ifprefix, int num_if, int id);
+
+/* TODO: doc */
+int tun_init_mbms(char *ifsuffix, int id);
+
+/*! \fn int  tun_config(char*, int, int)
+ * \brief This function initializes the nasmesh interface using the basic values,
+ * basic address, network mask and broadcast address, as the default configured
+ * ones
+ * \param[in] interface_id number of this interface, prepended after interface
+ * name
+ * \param[in] ipv4 IPv4 address of this interface as a string
+ * \param[in] ipv6 IPv6 address of this interface as a string
+ * \param[in] ifprefix interface name prefix to which an interface number will
+ * be appended
+ * \return true on success, otherwise false
+ * \note
+ * @ingroup  _nas
  */
+bool tun_config(int interface_id, const char *ipv4, const char *ipv6, const char *ifprefix);
+
+/*!
+ * \brief Setup a IPv4 rule in table (interface_id - 1 + 10000) and route to
+ * force packets coming into interface back through it, and workaround
+ * net.ipv4.conf.all.rp_filter=2 (strict source filtering would filter out
+ * responses of packets going out through interface to another IP address not
+ * in same subnet).
+ * \param[in] interface_id number of this interface, prepended after interface
+ * name
+ * \param[in] ipv4 IPv4 address of the UE
+ * \param[in] ifprefix interface name prefix to which an interface number will
+ * be appended
+ */
+void setup_ue_ipv4_route(int interface_id, const char *ipv4, const char *ifpref);
 
-#ifndef __BYPASS_SESSION_LAYER_EXTERN_H__
-#    define __BYPASS_SESSION_LAYER_EXTERN_H__
-
-#include <pthread.h>
-
-
-extern unsigned char Emulation_status;
-extern unsigned char emu_tx_status;
-extern unsigned char emu_rx_status;
-//extern unsigned int Master_list;
-//extern unsigned short Master_id;
-//extern unsigned int Is_primary_master;
-
-#if !defined(ENABLE_NEW_MULTICAST)
-extern pthread_mutex_t Tx_mutex;
-extern pthread_cond_t Tx_cond;
-extern char Tx_mutex_var;
-#endif
-
-extern rx_handler_t rx_handler;
-extern tx_handler_t tx_handler;
-
-extern eNB_transport_info_t eNB_transport_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs];
-extern uint16_t eNB_transport_info_TB_index[NUMBER_OF_eNB_MAX][MAX_NUM_CCs];
-
-extern UE_transport_info_t UE_transport_info[NUMBER_OF_UE_MAX][MAX_NUM_CCs];
-
-extern UE_cntl ue_cntl_delay[NUMBER_OF_UE_MAX][MAX_NUM_CCs][2];
-
-#endif
+#endif /*TUN_IF_H_*/

doc/BUILD.md

@@ -38,7 +38,6 @@ Running the  [build_oai](../cmake_targets/build_oai) script also generates some
 
 - `conf2uedata`: a binary used to build the (4G) UE data from a configuration file. The created file emulates the sim card  of a 3GPP compliant phone.
 - `nvram`: a binary used to build (4G) UE (IMEI...) and EMM (IMSI, registered PLMN) non volatile data.
-- `rb_tool`: radio bearer utility for (4G) UE
 - `genids` T Tracer utility, used at build time to generate `T_IDs.h` include file. This binary is located in the [T Tracer source file directory](../common/utils/T) .
 
 The build system for OAI uses [cmake](https://cmake.org/) which is a  tool to generate makefiles. The `build_oai` script is a wrapper using `cmake` and `make`/`ninja` to ease the oai build and use. It logs the `cmake` and `ninja`/`make` commands it executes. The file describing how to build the executables from source files is the [CMakeLists.txt](../CMakeLists.txt), it is used as input by cmake to generate the makefiles.

doc/Doxyfile

@@ -866,6 +866,8 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_cmdline.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_meas.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_meas.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/tun_if.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/tun_if.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/utils.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/oai_asn1.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/system.h \
@@ -1874,10 +1876,6 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/rrc_defs.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR_UE/L2_interface_ue.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/rb_config.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/rb_config.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/nas_config.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NAS/nas_config.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/rrc_gNB_internode.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/nr_rrc_defs.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/NR/cucp_cuup_if.h \
@@ -2308,13 +2306,6 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_freq_equalization.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/socket.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/socket.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/defs.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/adc.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/dac.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/rf.h \

doc/L1SIM.md

@@ -45,7 +45,7 @@ $ source oaienv
 $ cd cmake_targets/tools
 $ sudo -E ./init_nas_nos1 eNB
 $ cd ../ran_build/build
-$ sudo -E ./lte-softmodem -O YYY.conf --noS1 --nokrnmod 0
+$ sudo -E ./lte-softmodem -O YYY.conf --noS1
 ```
 
 # How to run a UE with the noS1 option
@@ -59,7 +59,7 @@ $ source oaienv
 $ cd cmake_targets/tools
 $ sudo -E ./init_nas_nos1 UE
 $ cd ../ran_build/build
-$ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1 --nokrnmod 0
+$ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1
 ```
 
 That should give you equivalent functionality to what you had with oaisim including noise and RF channel emulation (path loss / fading, etc.). You should also be able to run multiple UEs. 

doc/iqrecordplayer_usage.md

@@ -33,7 +33,7 @@ than the value of `--subframes-max` parameter.
 
 >Recording session example:
 ```bash
-./nr-uesoftmodem -O /home/oaitests/mediatek_sim.conf --sa --nokrnmod 1 --numerology 1 -r 106 -C 3649440000 --band 78 -E --ue-fo-compensation --device.recplay.subframes-record 1 --device.recplay.subframes-file /home/iqs/oai-nrUE-17042023.dat --device.recplay.use-mmap 1 --device.recplay.subframes-max 30000
+./nr-uesoftmodem -O /home/oaitests/mediatek_sim.conf --sa --numerology 1 -r 106 -C 3649440000 --band 78 -E --ue-fo-compensation --device.recplay.subframes-record 1 --device.recplay.subframes-file /home/iqs/oai-nrUE-17042023.dat --device.recplay.use-mmap 1 --device.recplay.subframes-max 30000
 ............................................
 ............................................
 ............................................
@@ -54,7 +54,7 @@ options for replay mode are:
 
 >Replay mode session example:
 ```bash
-./nr-uesoftmodem -O /home/oaitests/mediatek_sim.conf --sa --nokrnmod 1 --numerology 1 -r 106 -C 3649440000 --band 78 -E --ue-fo-compensation --device.recplay.subframes-replay 1 --device.recplay.subframes-file /home/iqs/oai-nrUE-17042023.dat --device.recplay.use-mmap 1 --device.recplay.subframes-loops 1
+./nr-uesoftmodem -O /home/oaitests/mediatek_sim.conf --sa --numerology 1 -r 106 -C 3649440000 --band 78 -E --ue-fo-compensation --device.recplay.subframes-replay 1 --device.recplay.subframes-file /home/iqs/oai-nrUE-17042023.dat --device.recplay.use-mmap 1 --device.recplay.subframes-loops 1
 ..................................
 ..................................
 [HW]   Replay iqs from USRP B200 device, bandwidth 4.000000e+07

executables/lte-enb.c

@@ -85,7 +85,6 @@
 #include "executables/lte-softmodem.h"
 
 #include "s1ap_eNB.h"
-#include "SIMULATION/ETH_TRANSPORT/proto.h"
 
 #include "T.h"
 

executables/lte-ru.c

@@ -72,8 +72,6 @@ static int DEFRUTPCORES[] = {2,4,6,8};
 #include "ENB_APP/enb_paramdef.h"
 #include "common/config/config_userapi.h"
 
-#include "SIMULATION/ETH_TRANSPORT/proto.h"
-
 #include "T.h"
 
 #include "executables/softmodem-common.h"

executables/lte-softmodem.c

@@ -407,18 +407,14 @@ extern void  phy_free_RU(RU_t *);
 static void init_pdcp(void)
 {
   pdcp_layer_init();
-  uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ?
-                           (PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT;
+  uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ? 0 : LINK_ENB_PDCP_TO_GTPV1U_BIT;
 
   if (IS_SOFTMODEM_NOS1)
-    pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT  ;
+    pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_BIT;
 
   pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_W_MBMS_BIT;
 
   pdcp_module_init(pdcp_initmask, 0);
-
-  pdcp_set_rlc_data_req_func(rlc_data_req);
-  pdcp_set_pdcp_data_ind_func(pdcp_data_ind);
 }
 
 static  void wait_nfapi_init(char *thread_name) {

executables/lte-softmodem.h

@@ -26,7 +26,6 @@
 #include "PHY/defs_eNB.h"
 #include "PHY/defs_UE.h"
 #include "s1ap_eNB.h"
-#include "SIMULATION/ETH_TRANSPORT/proto.h"
 #include "executables/softmodem-common.h"
 
 

executables/lte-ue.c

@@ -80,11 +80,6 @@ void init_UE_threads_stub(int);
 void init_UE_single_thread_stub(int);
 void *UE_thread(void *arg);
 int init_timer_thread(void);
-extern void multicast_link_start(void (*rx_handlerP) (unsigned int, char *),
-                                 unsigned char _multicast_group,
-                                 char *multicast_ifname);
-extern int multicast_link_write_sock(int groupP, char *dataP, uint32_t sizeP);
-
 
 int tx_req_num_elems;
 extern uint16_t sf_ahead;
@@ -364,10 +359,9 @@ void init_UE_stub_single_thread(int nb_inst,
   init_UE_single_thread_stub(nb_inst);
   printf("UE threads created \n");
 
-  if(NFAPI_MODE!=NFAPI_UE_STUB_PNF && NFAPI_MODE!=NFAPI_MODE_STANDALONE_PNF) {
-    LOG_I(PHY,"Starting multicast link on %s\n",emul_iface);
-    multicast_link_start(ue_stub_rx_handler,0,emul_iface);
-  }
+  AssertFatal(NFAPI_MODE == NFAPI_UE_STUB_PNF || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF,
+              "unsupported NFAPI mode %d\n",
+              NFAPI_MODE);
 }
 
 void init_UE_standalone_thread(int ue_idx) {
@@ -408,8 +402,9 @@ void init_UE_stub(int nb_inst,
   printf("UE threads created \n");
   LOG_I(PHY,"Starting multicast link on %s\n",emul_iface);
 
-  if(NFAPI_MODE!=NFAPI_UE_STUB_PNF && NFAPI_MODE!=NFAPI_MODE_STANDALONE_PNF)
-    multicast_link_start(ue_stub_rx_handler,0,emul_iface);
+  AssertFatal(NFAPI_MODE == NFAPI_UE_STUB_PNF || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF,
+              "unsupported NFAPI mode %d\n",
+              NFAPI_MODE);
 }
 
 
@@ -2356,15 +2351,7 @@ static void *timer_thread( void *param ) {
       }
 
       nanosleep(&t_sleep, (struct timespec *)NULL);
-      UE_tport_t pdu;
-      pdu.header.packet_type = TTI_SYNC;
-      pdu.header.absSF = (timer_frame*10)+timer_subframe;
-
-      if (NFAPI_MODE != NFAPI_UE_STUB_PNF && NFAPI_MODE != NFAPI_MODE_STANDALONE_PNF) {
-        multicast_link_write_sock(0,
-                                  (char *)&pdu,
-                                  sizeof(UE_tport_header_t));
-      }
+      AssertFatal(NFAPI_MODE == NFAPI_UE_STUB_PNF || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF, "unsupported NFAPI mode %d\n", NFAPI_MODE);
     } else {
       wait_on_condition(&UE->timer_mutex,&UE->timer_cond,&UE->instance_cnt_timer,"timer_thread");
       release_thread(&UE->timer_mutex,&UE->instance_cnt_timer,"timer_thread");

executables/lte-uesoftmodem.c

@@ -488,18 +488,21 @@ static inline void wait_nfapi_init(char *thread_name) {
 }
 
 static void init_pdcp(int ue_id) {
-  uint32_t pdcp_initmask = (!IS_SOFTMODEM_NOS1) ? LINK_ENB_PDCP_TO_GTPV1U_BIT : (LINK_ENB_PDCP_TO_GTPV1U_BIT | PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT);
+  uint32_t pdcp_initmask = !IS_SOFTMODEM_NOS1 ? LINK_ENB_PDCP_TO_GTPV1U_BIT : LINK_ENB_PDCP_TO_GTPV1U_BIT;
 
   if (IS_SOFTMODEM_RFSIM || (nfapi_getmode()==NFAPI_UE_STUB_PNF)) {
     pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
   }
 
-  if (IS_SOFTMODEM_NOKRNMOD)
-    pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
+  // previous code was:
+  //   if (IS_SOFTMODEM_NOKRNMOD)
+  //     pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
+  // The kernel module (KRNMOD) has been removed from the project, so the 'if'
+  // was removed but the flag 'pdcp_initmask' was kept, as "no kernel module"
+  // was always set. further refactoring could take it out
+  pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
 
   pdcp_module_init(pdcp_initmask, ue_id);
-  pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t) rlc_data_req);
-  pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) pdcp_data_ind);
 }
 
 // Stupid function addition because UE itti messages queues definition is common with eNB

executables/nr-gnb.c

@@ -75,7 +75,6 @@
 #include "UTIL/OPT/opt.h"
 #include "gnb_paramdef.h"
 
-#include "SIMULATION/ETH_TRANSPORT/proto.h"
 #include <executables/softmodem-common.h>
 
 #include "T.h"

executables/nr-ru.c

@@ -65,7 +65,6 @@ static int DEFRUTPCORES[] = {-1,-1,-1,-1};
 #include "GNB_APP/gnb_paramdef.h"
 #include "common/config/config_userapi.h"
 
-#include "SIMULATION/ETH_TRANSPORT/proto.h"
 #include <openair1/PHY/TOOLS/phy_scope_interface.h>
 
 

executables/nr-softmodem-common.h

@@ -30,8 +30,6 @@
 #include "PHY/types.h"
 #include <threadPool/thread-pool.h>
 
-#include "SIMULATION/ETH_TRANSPORT/proto.h"
-
 /* help strings definition for command line options, used in CMDLINE_XXX_DESC macros and printed when -h option is used */
 #define CONFIG_HLP_RFCFGF        "Configuration file for front-end (e.g. LMS7002M)\n"
 #define CONFIG_HLP_ULMAXE        "set the eNodeB max ULSCH erros\n"
@@ -103,8 +101,8 @@
 #define CONFIG_HLP_TELN          "Start embedded telnet server \n"
 #define CONFIG_HLP_SNR           "Set average SNR in dB (for --siml1 option)\n"
 #define CONFIG_HLP_NOS1          "Disable s1 interface\n"
-#define CONFIG_HLP_NOKRNMOD      "(noS1 only): Use tun instead of namesh module \n"
 #define CONFIG_HLP_AGC "Rx Gain control used for UE"
+
 /*--------------------------------------------------------------------------------------------------------------------------------*/
 /*                                            command line parameters for LOG utility                                             */
 /*   optname         helpstr          paramflags          XXXptr                     defXXXval            type           numelt   */

executables/nr-softmodem.c

@@ -140,8 +140,6 @@ uint8_t nb_antenna_rx = 1;
 
 int otg_enabled;
 
-#include <SIMULATION/ETH_TRANSPORT/proto.h>
-
 extern void reset_opp_meas(void);
 extern void print_opp_meas(void);
 
@@ -542,10 +540,8 @@ static  void wait_nfapi_init(char *thread_name) {
 }
 
 void init_pdcp(void) {
-  uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ?
-    PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT:
-    LINK_ENB_PDCP_TO_GTPV1U_BIT;
-  
+  uint32_t pdcp_initmask = IS_SOFTMODEM_NOS1 ? ENB_NAS_USE_TUN_BIT : LINK_ENB_PDCP_TO_GTPV1U_BIT;
+
   if (!NODE_IS_DU(get_node_type())) {
     nr_pdcp_layer_init(get_node_type() == ngran_gNB_CUCP);
     nr_pdcp_module_init(pdcp_initmask, 0);
@@ -654,12 +650,7 @@ int main( int argc, char **argv ) {
   itti_init(TASK_MAX, tasks_info);
   // initialize mscgen log after ITTI
   init_opt();
-  if(PDCP_USE_NETLINK && !IS_SOFTMODEM_NOS1) {
-    netlink_init();
-    if (get_softmodem_params()->nsa) {
-      init_pdcp();
-    }
-  }
+
 #ifndef PACKAGE_VERSION
 #define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL"
 #endif

executables/nr-uesoftmodem.c

@@ -326,22 +326,25 @@ void init_openair0()
 
 static void init_pdcp(int ue_id)
 {
-  uint32_t pdcp_initmask = (!IS_SOFTMODEM_NOS1) ? LINK_ENB_PDCP_TO_GTPV1U_BIT : (LINK_ENB_PDCP_TO_GTPV1U_BIT | PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT);
+  uint32_t pdcp_initmask = (!IS_SOFTMODEM_NOS1) ? LINK_ENB_PDCP_TO_GTPV1U_BIT : LINK_ENB_PDCP_TO_GTPV1U_BIT;
 
   /*if (IS_SOFTMODEM_RFSIM || (nfapi_getmode()==NFAPI_UE_STUB_PNF)) {
     pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
   }*/
 
-  if (IS_SOFTMODEM_NOKRNMOD) {
-    pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
-  }
+  // previous code was:
+  //   if (IS_SOFTMODEM_NOKRNMOD)
+  //     pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
+  // The kernel module (KRNMOD) has been removed from the project, so the 'if'
+  // was removed but the flag 'pdcp_initmask' was kept, as "no kernel module"
+  // was always set. further refactoring could take it out
+  pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
+
   if (get_softmodem_params()->nsa && rlc_module_init(0) != 0) {
     LOG_I(RLC, "Problem at RLC initiation \n");
   }
   nr_pdcp_layer_init(false);
   nr_pdcp_module_init(pdcp_initmask, ue_id);
-  pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t) rlc_data_req);
-  pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) pdcp_data_ind);
 }
 
 // Stupid function addition because UE itti messages queues definition is common with eNB

executables/nr-uesoftmodem.h

@@ -3,9 +3,6 @@
 #include <executables/nr-softmodem-common.h>
 #include <executables/softmodem-common.h>
 #include "PHY/defs_nr_UE.h"
-#include "SIMULATION/ETH_TRANSPORT/proto.h"
-
-
 
 #define  CONFIG_HLP_IF_FREQ                "IF frequency for RF, if needed\n"
 #define  CONFIG_HLP_IF_FREQ_OFF            "UL IF frequency offset for RF, if needed\n"

executables/softmodem-common.c

@@ -97,7 +97,7 @@ void get_common_options(configmodule_interface_t *cfg, uint32_t execmask)
   uint32_t glog_level=0 ;
   uint32_t start_telnetsrv = 0, start_telnetclt = 0;
   uint32_t start_websrv = 0;
-  uint32_t noS1 = 0, nokrnmod = 1, nonbiot = 0;
+  uint32_t noS1 = 0, nonbiot = 0;
   uint32_t rfsim = 0, do_forms = 0;
   int nfapi_index = 0;
   char *logmem_filename = NULL;
@@ -146,10 +146,6 @@ void get_common_options(configmodule_interface_t *cfg, uint32_t execmask)
     set_softmodem_optmask(SOFTMODEM_NOS1_BIT);
   }
 
-  if (nokrnmod) {
-    set_softmodem_optmask(SOFTMODEM_NOKRNMOD_BIT);
-  }
-
   if (nonbiot) {
     set_softmodem_optmask(SOFTMODEM_NONBIOT_BIT);
   }

executables/softmodem-common.h

@@ -99,7 +99,6 @@ extern "C"
 
 #define CONFIG_HLP_NOS1          "Disable s1 interface\n"
 #define CONFIG_HLP_RFSIM         "Run in rf simulator mode\n"
-#define CONFIG_HLP_NOKRNMOD      "(noS1 only): Use tun instead of namesh module \n"
 #define CONFIG_HLP_DISABLNBIOT   "disable nb-iot, even if defined in config\n"
 #define CONFIG_HLP_USRP_THREAD   "having extra thead for usrp tx\n"
 #define CONFIG_HLP_NFAPI         "Change the nFAPI mode for NR 'MONOLITHIC', 'PNF', 'VNF', 'AERIAL','UE_STUB_PNF','UE_STUB_OFFNET','STANDALONE_PNF'\n"
@@ -173,7 +172,6 @@ extern int usrp_tx_thread;
   {"worker-config",         CONFIG_HLP_WORKER_CMD,    0,              .strptr=&worker_config,                 .defstrval=NULL,          TYPE_STRING, 0},  \
   {"noS1",                  CONFIG_HLP_NOS1,          PARAMFLAG_BOOL, .uptr=&noS1,                            .defintval=0,             TYPE_UINT,   0},  \
   {"rfsim",                 CONFIG_HLP_RFSIM,         PARAMFLAG_BOOL, .uptr=&rfsim,                           .defintval=0,             TYPE_UINT,   0},  \
-  {"nokrnmod",              CONFIG_HLP_NOKRNMOD,      PARAMFLAG_BOOL, .uptr=&nokrnmod,                        .defintval=1,             TYPE_UINT,   0},  \
   {"nbiot-disable",         CONFIG_HLP_DISABLNBIOT,   PARAMFLAG_BOOL, .uptr=&nonbiot,                         .defuintval=0,            TYPE_UINT,   0},  \
   {"chest-freq",            CONFIG_HLP_CHESTFREQ,     0,              .iptr=&CHEST_FREQ,                      .defintval=0,             TYPE_INT,    0},  \
   {"chest-time",            CONFIG_HLP_CHESTTIME,     0,              .iptr=&CHEST_TIME,                      .defintval=0,             TYPE_INT,    0},  \
@@ -224,7 +222,6 @@ extern int usrp_tx_thread;
     { .s5 = { NULL } },                     \
     { .s5 = { NULL } },                     \
     { .s5 = { NULL } },                     \
-    { .s5 = { NULL } },                     \
     { .s3a = { config_checkstr_assign_integer, \
                {"MONOLITHIC", "PNF", "VNF", "AERIAL","UE_STUB_PNF","UE_STUB_OFFNET","STANDALONE_PNF"}, \
                {NFAPI_MONOLITHIC, NFAPI_MODE_PNF, NFAPI_MODE_VNF, NFAPI_MODE_AERIAL,NFAPI_UE_STUB_PNF,NFAPI_UE_STUB_OFFNET,NFAPI_MODE_STANDALONE_PNF}, \
@@ -278,7 +275,6 @@ extern int usrp_tx_thread;
 /***************************************************************************************************************************************/
 
 #define SOFTMODEM_NOS1_BIT            (1<<0)
-#define SOFTMODEM_NOKRNMOD_BIT        (1<<1)
 #define SOFTMODEM_NONBIOT_BIT         (1<<2)
 #define SOFTMODEM_RFSIM_BIT           (1<<10)
 #define SOFTMODEM_SIML1_BIT           (1<<12)
@@ -298,7 +294,6 @@ extern int usrp_tx_thread;
 
 
 #define IS_SOFTMODEM_NOS1            ( get_softmodem_optmask() & SOFTMODEM_NOS1_BIT)
-#define IS_SOFTMODEM_NOKRNMOD        ( get_softmodem_optmask() & SOFTMODEM_NOKRNMOD_BIT)
 #define IS_SOFTMODEM_NONBIOT         ( get_softmodem_optmask() & SOFTMODEM_NONBIOT_BIT)
 #define IS_SOFTMODEM_RFSIM           ( get_softmodem_optmask() & SOFTMODEM_RFSIM_BIT)
 #define IS_SOFTMODEM_SIML1           ( get_softmodem_optmask() & SOFTMODEM_SIML1_BIT)

openair1/PHY/LTE_UE_TRANSPORT/sldch.c

@@ -31,8 +31,6 @@
  */
 #include "PHY/defs_UE.h"
 
-extern int multicast_link_write_sock(int groupP, char *dataP, uint32_t sizeP);
-
 void generate_sldch(PHY_VARS_UE *ue,SLDCH_t *sldch,int frame_tx,int subframe_tx) {
 
   UE_tport_t pdu;
@@ -54,10 +52,5 @@ void generate_sldch(PHY_VARS_UE *ue,SLDCH_t *sldch,int frame_tx,int subframe_tx)
         sldch->payload_length,
         sldch_header_len+sizeof(SLDCH_t)-sizeof(uint8_t*)+sldch->payload_length);
 
-  multicast_link_write_sock(0,
-                            (char *)&pdu,
-                            sldch_header_len+sizeof(SLDCH_t));
-
+  AssertFatal(false, "multicast_link_write_sock() not implemented\n");
 }
-
-

openair1/PHY/LTE_UE_TRANSPORT/slsch.c

@@ -31,10 +31,6 @@
  */
 #include "PHY/defs_UE.h"
 
-extern int
-multicast_link_write_sock(int groupP, char *dataP, uint32_t sizeP);
-
-
 void generate_slsch(PHY_VARS_UE *ue,SLSCH_t *slsch,int frame_tx,int subframe_tx) {
 
   UE_tport_t pdu;
@@ -58,9 +54,6 @@ void generate_slsch(PHY_VARS_UE *ue,SLSCH_t *slsch,int frame_tx,int subframe_tx)
 	  slsch->payload_length,
 	  slsch_header_len+sizeof(SLSCH_t)-sizeof(uint8_t*)+slsch->payload_length);
     
-    multicast_link_write_sock(0, 
-			      (char *)&pdu,
-			      slsch_header_len+sizeof(SLSCH_t)-sizeof(uint8_t*)+slsch->payload_length);
-    
+    AssertFatal(false, "multicast_link_write_sock() not implemented\n");
   }
 }

openair1/PHY/defs_nr_UE.h

@@ -648,5 +648,4 @@ static inline void stop_meas_nr_ue_phy(PHY_VARS_NR_UE *ue, int meas_index) {
   stop_meas(&ue->phy_cpu_stats.cpu_time_stats[meas_index]);
 }
 
-#include "SIMULATION/ETH_TRANSPORT/defs.h"
 #endif

openair1/SIMULATION/ETH_TRANSPORT/Makefile.inc

-ETHERNET_TRANSPORT_OBJS  = $(TOP_DIR)/SIMULATION/ETH_TRANSPORT/netlink_init.o
-ETHERNET_TRANSPORT_OBJS += $(TOP_DIR)/SIMULATION/ETH_TRANSPORT/multicast_link.o
-ETHERNET_TRANSPORT_OBJS += $(TOP_DIR)/SIMULATION/ETH_TRANSPORT/socket.o
-ETHERNET_TRANSPORT_OBJS += $(TOP_DIR)/SIMULATION/ETH_TRANSPORT/bypass_session_layer.o
-ETHERNET_TRANSPORT_OBJS += $(TOP_DIR)/SIMULATION/ETH_TRANSPORT/emu_transport.o
-ETHERNET_TRANSPORT_OBJS += $(TOP_DIR)/SIMULATION/ETH_TRANSPORT/pgm_link.o

openair1/SIMULATION/ETH_TRANSPORT/README.txt

-For reliable UDP multicast, the libpgm-dev should be installed on the machines,
-otherwise the old multicast method using simply UDP will be used, resulting in
-packet loss and unexpected behaviour of oaisim.
-
-To compile OAI with PGM:
-
-For Ubuntu 12.04 and earliers:
-    sudo apt-get install libpgm-dev
-    is sufficient
-
-For Ubuntu older than 12.04:
-
-wget http://openpgm.googlecode.com/files/libpgm-5.1.118.tar.gz
-tar xvf libpgm-5.1.118.tar.gz
-cd libpgm-5.1.118/openpgm/pgm
-./configure --prefix=/usr
-make
-sudo make install
-
-We have to clean oaisim compilation and re-compile
-
-
-When running OAI, the -D should be used to provide the NIC to bind.
-Parameter can be either an interface name or an ip address (refer to this link
-for more informations: http://code.google.com/p/openpgm/wiki/OpenPgmConceptsTransport)

openair1/SIMULATION/ETH_TRANSPORT/defs.h

-/*
- * 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
- */
-
-/*! \file defs.h
- *  \brief specifies the data structure and variable for phy emulation
- *  \author Navid Nikaein, Raymomd Knopp  and Hicham Anouar
- *  \date 2011
- *  \version 1.1
- *  \company Eurecom
- *  \email: navid.nikaein@eurecom.fr
- */
-
-#ifndef __BYPASS_SESSION_LAYER_DEFS_H__
-#    define __BYPASS_SESSION_LAYER_DEFS_H__
-//-----------------------------------------------------------------------------
-//#include "openair_defs.h"
-#include "common/openairinterface5g_limits.h"
-#include "PHY/defs_common.h"
-#include "PHY/LTE_TRANSPORT/uci_common.h"
-
-typedef enum emu_transport_info_e {
-  EMU_TRANSPORT_INFO_ERROR    = 0x0,
-  EMU_TRANSPORT_INFO_WAIT_PM,
-  EMU_TRANSPORT_INFO_WAIT_SM,
-  EMU_TRANSPORT_INFO_SYNC,
-  EMU_TRANSPORT_INFO_ENB,
-  EMU_TRANSPORT_INFO_UE,
-  EMU_TRANSPORT_INFO_RELEASE
-} emu_transport_info_t;
-
-#define WAIT_PM_TRANSPORT 1
-#define WAIT_SM_TRANSPORT 2
-#define SYNC_TRANSPORT 3
-#define ENB_TRANSPORT 4
-#define UE_TRANSPORT 5
-#define RELEASE_TRANSPORT 6
-
-#define WAIT_SYNC_TRANSPORT 1
-#define SYNCED_TRANSPORT 2
-//#define WAIT_ENB_TRANSPORT 2
-//#define WAIT_UE_TRANSPORT 3
-
-
-#define BYPASS_RX_BUFFER_SIZE 64000
-#define BYPASS_TX_BUFFER_SIZE 64000
-
-typedef unsigned int (*tx_handler_t) (unsigned char, char*, unsigned int*, unsigned int*);
-typedef unsigned int (*rx_handler_t) (unsigned char, char*, unsigned int);
-
-/*************************************************************/
-
-typedef struct eNB_cntl_s {
-  uint32_t pbch_flag:1;
-  uint32_t pmch_flag:1;
-  uint32_t pss:2;
-  uint32_t sss:8;
-  uint32_t cfi:2;
-  uint32_t phich:19; // max 200 bit
-  //  uint32_t pbch_payload:24;
-  uint32_t pbch_payload;
-} eNB_cntl;
-
-typedef struct UE_cntl_s {
-  uint8_t pucch_flag:3;  // 0,7 = none, 1 = type 1, 2=type 1a, 3=type 1b, 4=type 2, 5=type 2a, 6=type 2b
-  uint8_t pucch_Ncs1:3;  // physical configuration of pucch, for abstraction purposes
-  uint32_t pucch_payload:21;        // ack/nak/cqi information
-  uint8_t sr:1;
-  uint8_t pusch_flag:1;  // 0=none,1=active
-  uint8_t pucch_sel:1;
-  //uint32_t pusch_uci;     // uci information on pusch
-  uint8_t pusch_uci[MAX_CQI_BYTES];
-  uint8_t uci_format;
-  uint8_t length_uci;
-  uint8_t pusch_ri:2;    // ri information on pusch
-  uint8_t pusch_ack:2;   // ack/nak on pusch
-  uint8_t prach_flag:1;  // 0=none,1=active
-  uint8_t prach_id:6;    // this is the PHY preamble index for the prach
-} UE_cntl;
-
-#define MAX_TRANSPORT_BLOCKS_BUFFER_SIZE 16384
-//#define MAX_PMCH_TRANSPORT_BLOCKS_BUFFER_SIZE 8192 // 16384
-#define MAX_NUM_DCI 5+1 // +1: for PMCH/MCH
-
-typedef struct eNB_transport_info_s {
-  eNB_cntl cntl;
-  uint8_t num_pmch;
-  uint8_t num_common_dci;
-  uint8_t num_ue_spec_dci;
-  DCI_ALLOC_t dci_alloc[MAX_NUM_DCI];
-  uint8_t dlsch_type[MAX_NUM_DCI];
-  uint8_t harq_pid[MAX_NUM_DCI];
-  uint8_t ue_id[MAX_NUM_DCI];
-  uint16_t tbs[MAX_NUM_DCI*2];    // times 2 for dual-stream MIMO formats
-  uint8_t transport_blocks[MAX_TRANSPORT_BLOCKS_BUFFER_SIZE];
-  //uint8_t pmch_transport_blocks[MAX_PMCH_TRANSPORT_BLOCKS_BUFFER_SIZE];
-} __attribute__((__packed__)) eNB_transport_info_t ;
-
-typedef struct UE_transport_info_s {
-  UE_cntl cntl;
-  uint8_t num_eNB;
-  uint16_t rnti[NUMBER_OF_CONNECTED_eNB_MAX];
-  uint8_t eNB_id[NUMBER_OF_CONNECTED_eNB_MAX];
-  uint8_t harq_pid[NUMBER_OF_CONNECTED_eNB_MAX];
-  uint16_t tbs[NUMBER_OF_CONNECTED_eNB_MAX];
-  uint8_t transport_blocks[MAX_TRANSPORT_BLOCKS_BUFFER_SIZE];//*NUMBER_OF_CONNECTED_eNB_MAX];
-} __attribute__((__packed__)) UE_transport_info_t ;
-
-/*! \brief */
-typedef struct bypass_msg_header_s {
-  unsigned char  Message_type; /*! \brief control or data*/
-  //unsigned char  nb_master; /*! \brief */
-  unsigned char  master_id; /*! \brief */
-  unsigned int   nb_enb; /*! \brief */
-  unsigned int   nb_ue; /*! \brief */
-  unsigned int   nb_flow; /*! \brief */
-  unsigned int   frame;
-  unsigned int   subframe;
-  uint64_t       seq_num;
-  unsigned int   failing_master_id;
-} __attribute__((__packed__)) bypass_msg_header_t;
-
-typedef struct bypass_proto2multicast_header_s {
-  unsigned int      size;
-} bypass_proto2multicast_header_t;
-
-#endif /* __BYPASS_SESSION_LAYER_DEFS_H__ */

openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h

-/*
- * 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
- */
-
-/*! \file multicast_link.h
- *  \brief
- *  \author Lionel Gauthier and Navid Nikaein
- *  \date 2011
- *  \version 1.1
- *  \company Eurecom
- *  \email: navid.nikaein@eurecom.fr
- */
-
-#ifndef __MULTICAST_LINK_H__
-#    define __MULTICAST_LINK_H__
-#    ifdef MULTICAST_LINK_C
-#        define private_multicast_link(x) x
-#        define public_multicast_link(x) x
-#    else
-#        define private_multicast_link(x)
-#        define public_multicast_link(x) extern x
-#    endif
-#    include "stdint.h"
-
-private_multicast_link (typedef struct multicast_group_t {
-  int      socket;
-  struct sockaddr_in sock_remote_addr;
-  char     host_addr[16];
-  uint16_t port;
-  char     rx_buffer[40000];
-} multicast_group_t;)
-
-#define MULTICAST_LINK_NUM_GROUPS 4
-
-extern const char *multicast_group_list[MULTICAST_LINK_NUM_GROUPS];
-
-private_multicast_link(void  multicast_link_init (void));
-private_multicast_link(void  multicast_link_read_data (int groupP));
-private_multicast_link(void  multicast_link_read (void));
-private_multicast_link(void *multicast_link_main_loop (void *param));
-
-public_multicast_link(int   multicast_link_write_sock (int groupP, char *dataP, uint32_t sizeP));
-public_multicast_link(void  multicast_link_start (  void (*rx_handlerP) (unsigned int, char*), unsigned char multicast_group, char * multicast_ifname));
-# ifdef BYPASS_PHY
-public_multicast_link(pthread_mutex_t Bypass_phy_wr_mutex);
-public_multicast_link(pthread_cond_t Bypass_phy_wr_cond);
-public_multicast_link(char Bypass_phy_wr);
-# endif //BYPASS_PHY
-#endif

openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c

-/*
- * 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
- */
-
-/*! \file netlink_init.c
-* \brief initiate the netlink socket for communication with nas dirver
-* \author Navid Nikaein and Raymomd Knopp
-* \date 2011
-* \version 1.0
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr
-*/
-
-#include <sys/socket.h>
-#include <linux/netlink.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <errno.h>
-#include "common/platform_constants.h"
-
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <linux/if.h>
-#include <linux/if_tun.h>
-#include "common/openairinterface5g_limits.h"
-
-#include "pdcp.h"
-
-char nl_rx_buf[NL_MAX_PAYLOAD];
-
-struct sockaddr_nl nas_src_addr, nas_dest_addr;
-struct nlmsghdr *nas_nlh_tx = NULL;
-struct nlmsghdr *nas_nlh_rx = NULL;
-struct iovec nas_iov_tx;
-struct iovec nas_iov_rx = {nl_rx_buf, sizeof(nl_rx_buf)};
-
-int nas_sock_fd[MAX_MOBILES_PER_ENB*2]; //Allocated for both LTE UE and NR UE.
-
-int nas_sock_mbms_fd;
-
-struct msghdr nas_msg_tx;
-struct msghdr nas_msg_rx;
-
-#define GRAAL_NETLINK_ID 31
-
-static int tun_alloc(char *dev) {
-  struct ifreq ifr;
-  int fd, err;
-
-  if( (fd = open("/dev/net/tun", O_RDWR)) < 0 ) {
-    LOG_E(PDCP, "[TUN] failed to open /dev/net/tun\n");
-    return -1;
-  }
-
-  memset(&ifr, 0, sizeof(ifr));
-  /* Flags: IFF_TUN   - TUN device (no Ethernet headers)
-   *        IFF_TAP   - TAP device
-   *
-   *        IFF_NO_PI - Do not provide packet information
-   */
-  ifr.ifr_flags = IFF_TUN | IFF_NO_PI;
-
-  if( *dev )
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name)-1);
-
-  if( (err = ioctl(fd, TUNSETIFF, (void *) &ifr)) < 0 ) {
-    close(fd);
-    return err;
-  }
-
-  strcpy(dev, ifr.ifr_name);
-  return fd;
-}
-
-
-int netlink_init_mbms_tun(char *ifprefix, int id) {//for UE, id = 1, 2, ...,
-  int ret;
-  char ifname[64];
-
-    if (id > 0) {
-      sprintf(ifname, "oaitun_%.3s%d", ifprefix, id-1);
-    }
-    else {
-      sprintf(ifname, "oaitun_%.3s1", ifprefix); // added "1": for historical reasons
-    }
-    nas_sock_mbms_fd = tun_alloc(ifname);
-
-    if (nas_sock_mbms_fd == -1) {
-      printf("[NETLINK] Error opening mbms socket %s (%d:%s)\n",ifname,errno, strerror(errno));
-      exit(1);
-    }
-
-    printf("[NETLINK]Opened socket %s with fd %d\n",ifname,nas_sock_mbms_fd);
-    ret = fcntl(nas_sock_mbms_fd,F_SETFL,O_NONBLOCK);
-
-    if (ret == -1) {
-      printf("[NETLINK] Error fcntl (%d:%s)\n",errno, strerror(errno));
-
-      if (LINK_ENB_PDCP_TO_IP_DRIVER) {
-        exit(1);
-      }
-    }
-
-    memset(&nas_src_addr, 0, sizeof(nas_src_addr));
-    nas_src_addr.nl_family = AF_NETLINK;
-    nas_src_addr.nl_pid = 1;//getpid();  /* self pid */
-    nas_src_addr.nl_groups = 0;  /* not in mcast groups */
-    ret = bind(nas_sock_mbms_fd, (struct sockaddr *)&nas_src_addr, sizeof(nas_src_addr));
-
-  return 1;
-}
-
-int netlink_init_tun(char *ifprefix, int num_if, int id) {//for UE, id = 1, 2, ...,
-  int ret;
-  char ifname[64];
-
-  int begx = (id == 0) ? 0 : id - 1;
-  int endx = (id == 0) ? num_if : id;
-  for (int i = begx; i < endx; i++) {
-    sprintf(ifname, "oaitun_%.3s%d",ifprefix,i+1);
-    nas_sock_fd[i] = tun_alloc(ifname);
-
-    if (nas_sock_fd[i] == -1) {
-      LOG_E(PDCP, "TUN: Error opening socket %s (%d:%s)\n",ifname,errno, strerror(errno));
-      return 0;
-    }
-
-    LOG_I(PDCP, "TUN: Opened socket %s with fd nas_sock_fd[%d]=%d\n",
-           ifname, i, nas_sock_fd[i]);
-    ret = fcntl(nas_sock_fd[i],F_SETFL,O_NONBLOCK);
-
-    if (ret == -1) {
-      LOG_E(PDCP, "TUN: Error fcntl (%d:%s)\n",errno, strerror(errno));
-
-      if (LINK_ENB_PDCP_TO_IP_DRIVER) {
-        exit(1);
-      }
-    }
-  } /* for */
-
-  return 1;
-}
-
-
-int netlink_init(void) {
-  int ret;
-  nas_sock_fd[0] = socket(PF_NETLINK, SOCK_RAW,GRAAL_NETLINK_ID);
-
-  if (nas_sock_fd[0] == -1) {
-    printf("[NETLINK] Error opening GRAAL_NETLINK_ID socket %d (%d:%s)\n",nas_sock_fd[0],errno, strerror(errno));
-
-    if (LINK_ENB_PDCP_TO_IP_DRIVER) {
-      exit(1);
-    }
-  }
-
-  printf("[NETLINK] Opened socket with fd %d\n",nas_sock_fd[0]);
-  ret = fcntl(nas_sock_fd[0],F_SETFL,O_NONBLOCK);
-
-  if (ret == -1) {
-    printf("[NETLINK] Error fcntl (%d:%s)\n",errno, strerror(errno));
-
-    if (LINK_ENB_PDCP_TO_IP_DRIVER) {
-      exit(1);
-    }
-  }
-
-  memset(&nas_src_addr, 0, sizeof(nas_src_addr));
-  nas_src_addr.nl_family = AF_NETLINK;
-  nas_src_addr.nl_pid = 1;//getpid();  /* self pid */
-  nas_src_addr.nl_groups = 0;  /* not in mcast groups */
-  ret = bind(nas_sock_fd[0], (struct sockaddr *)&nas_src_addr, sizeof(nas_src_addr));
-  memset(&nas_dest_addr, 0, sizeof(nas_dest_addr));
-  nas_dest_addr.nl_family = AF_NETLINK;
-  nas_dest_addr.nl_pid = 0;   /* For Linux Kernel */
-  nas_dest_addr.nl_groups = 0; /* unicast */
-  // TX PART
-  free(nas_nlh_tx);
-  nas_nlh_tx=(struct nlmsghdr *)malloc(NLMSG_SPACE(NL_MAX_PAYLOAD));
-  memset(nas_nlh_tx, 0, NLMSG_SPACE(NL_MAX_PAYLOAD));
-  /* Fill the netlink message header */
-  nas_nlh_tx->nlmsg_len = NLMSG_SPACE(NL_MAX_PAYLOAD);
-  nas_nlh_tx->nlmsg_pid = 1;//getpid();  /* self pid */
-  nas_nlh_tx->nlmsg_flags = 0;
-  nas_iov_tx.iov_base = (void *)nas_nlh_tx;
-  nas_iov_tx.iov_len = nas_nlh_tx->nlmsg_len;
-  memset(&nas_msg_tx,0,sizeof(nas_msg_tx));
-  nas_msg_tx.msg_name = (void *)&nas_dest_addr;
-  nas_msg_tx.msg_namelen = sizeof(nas_dest_addr);
-  nas_msg_tx.msg_iov = &nas_iov_tx;
-  nas_msg_tx.msg_iovlen = 1;
-  // RX PART
-  memset(&nas_msg_rx,0,sizeof(nas_msg_rx));
-  nas_msg_rx.msg_name = (void *)&nas_src_addr;
-  nas_msg_rx.msg_namelen = sizeof(nas_src_addr);
-  nas_msg_rx.msg_iov = &nas_iov_rx;
-  nas_msg_rx.msg_iovlen = 1;
-  return(nas_sock_fd[0]);
-}
-
-void netlink_cleanup(void)
-{
-  free(nas_nlh_tx);
-  nas_nlh_tx = NULL;
-}

openair1/SIMULATION/ETH_TRANSPORT/proto.h

-/*
- * 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
- */
-
-/*! \file proto.h
-* \brief
-* \author Navid Nikaein
-* \date 2011
-* \version 1.0
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr
-*/
-
-#include "SIMULATION/ETH_TRANSPORT/defs.h"
-
-#ifndef EMU_PROTO_H_
-#define EMU_PROTO_H_
-
-void init_bypass (void);
-void bypass_init ( unsigned int (*tx_handlerP) (unsigned char,char *, unsigned int *, unsigned int *),unsigned int (*rx_handlerP) (unsigned char,char *,unsigned int));
-int bypass_rx_data(unsigned int frame, unsigned int last_slot,
-                   unsigned int next_slot, uint8_t is_master);
-void  bypass_signal_mac_phy(unsigned int frame, unsigned int last_slot,
-                            unsigned int next_slot, uint8_t is_master);
-void bypass_tx_data (emu_transport_info_t Type, unsigned int frame, unsigned int next_slot);
-
-void emulation_tx_rx(void);
-
-unsigned int emul_tx_handler(unsigned char Mode,char *Tx_buffer,unsigned int *Nbytes,unsigned int *Nb_flows);
-unsigned int emul_rx_handler(unsigned char Mode,char *rx_buffer, unsigned int Nbytes);
-
-unsigned int emul_rx_data(void);
-
-void emu_transport_info(unsigned int last_slot, unsigned int next_slot);
-void fill_phy_enb_vars(unsigned int enb_id, uint8_t CC_id,unsigned int next_slot);
-void fill_phy_ue_vars(unsigned int ue_id, uint8_t CC_id,unsigned int last_slot);
-void emu_transport_sync(void);
-void emu_transport(unsigned int frame, unsigned int last_slot,unsigned int next_slot, lte_subframe_t direction, unsigned char frame_type, int ethernet_flag );
-void emu_transport_DL(unsigned int frame, unsigned int last_slot,unsigned int next_slot);
-void emu_transport_UL(unsigned int frame, unsigned int last_slot,unsigned int next_slot);
-void emu_transport_release(void);
-
-int multicast_link_read_data_from_sock(uint8_t eNB_flag);
-
-void clear_eNB_transport_info(uint8_t);
-void clear_UE_transport_info(uint8_t);
-int netlink_init(void);
-int netlink_init_tun(char *ifsuffix, int num_if, int id);
-int netlink_init_mbms_tun(char *ifsuffix, int id);
-void netlink_cleanup(void);
-
-#endif /* EMU_PROTO_H_ */

openair1/SIMULATION/ETH_TRANSPORT/socket.c

-/*
- * 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
- */
-
-/*! \file socket.c
-* \brief
-* \author Lionel Gauthier
-* \date 2011
-* \version 1.0
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-//#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <assert.h>
-
-#define SOCKET_C
-//#include "openair_defs.h"
-#include "socket.h"
-
-#define msg printf
-//------------------------------------------------------------------------------
-void
-socket_setnonblocking (int sockP)
-{
-  //------------------------------------------------------------------------------
-
-  int             opts;
-
-  opts = fcntl (sockP, F_GETFL);
-
-  if (opts < 0) {
-    perror ("fcntl(F_GETFL)");
-    exit (EXIT_FAILURE);
-  }
-
-  opts = (opts | O_NONBLOCK);
-
-  if (fcntl (sockP, F_SETFL, opts) < 0) {
-    perror ("fcntl(F_SETFL)");
-    exit (EXIT_FAILURE);
-  }
-
-  return;
-}
-
-//------------------------------------------------------------------------------
-int
-make_socket_inet (int typeP, uint16_t * portP, struct sockaddr_in *ptr_addressP)
-{
-  //------------------------------------------------------------------------------
-
-  int             sock;
-  unsigned int             length = sizeof (struct sockaddr_in);
-  struct sockaddr_in name;
-
-
-  assert ((typeP == SOCK_STREAM) || (typeP == SOCK_DGRAM));
-
-  /* Create the socket. */
-  sock = socket (PF_INET, typeP, 0);
-
-  if (sock < 0) {
-    fprintf (stderr, "ERROR: %s line %d socket %m", __FILE__, __LINE__);
-    exit (EXIT_FAILURE);
-  }
-
-  /* Give the socket a name. */
-  name.sin_family = AF_INET;
-  name.sin_port = htons (*portP);
-  name.sin_addr.s_addr = htonl (INADDR_ANY);
-
-  if (bind (sock, (struct sockaddr *) &name, sizeof (name)) < 0) {
-    close (sock);
-    fprintf (stderr, "ERROR: %s line %d bind port %d %m", __FILE__, __LINE__, *portP);
-    exit (EXIT_FAILURE);
-  }
-
-  if (ptr_addressP != NULL) {
-    getsockname (sock, (struct sockaddr *) ptr_addressP, &length);
-  }
-
-  msg("[SOCKET] bound socket port %d\n", *portP);
-  return sock;
-}
-

openair1/SIMULATION/ETH_TRANSPORT/socket.h

-/*
- * 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
- */
-
-/*! \file socket.h
-* \brief
-* \author Lionel Gauthier
-* \date 2011
-* \version 1.0
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-*/
-
-#ifndef __SIMULATION_ETH_TRANSPORT_SOCKET__H__
-#define __SIMULATION_ETH_TRANSPORT_SOCKET__H__
-
-#    ifdef SOCKET_C
-#        define private_socket(x) x
-#        define public_socket(x) x
-#    else
-#        define private_socket(x)
-#        define public_socket(x) extern x
-#    endif
-#    include "stdint.h"
-public_socket (void socket_setnonblocking (int sockP);
-              )
-public_socket (int make_socket_inet (int typeP, uint16_t * portP, struct sockaddr_in *ptr_addressP);
-              )
-#endif

openair1/SIMULATION/LTE_PHY/dummy_functions.c

@@ -47,8 +47,6 @@ SLDCH_t *ue_get_sldch(module_id_t module_idP, int CC_id,frame_t frameP, sub_fram
 
 SLSCH_t *ue_get_slsch(module_id_t module_idP, int CC_id,frame_t frameP, sub_frame_t subframe) {return(NULL);}
 
-void multicast_link_write_sock(int groupP, char *dataP, uint32_t sizeP) {}
-
 uint16_t
 ue_process_rar(const module_id_t module_idP,
 	       const int CC_id,

openair2/F1AP/f1ap_cu_rrc_message_transfer.c

@@ -279,14 +279,13 @@ int CU_handle_UL_RRC_MESSAGE_TRANSFER(instance_t instance, sctp_assoc_t assoc_id
   uint8_t *mb = malloc16(ie->value.choice.RRCContainer.size);
   memcpy(mb, ie->value.choice.RRCContainer.buf, ie->value.choice.RRCContainer.size);
   LOG_D(F1AP, "Calling pdcp_data_ind for UE RNTI %lx srb_id %lu with size %ld (DCCH) \n", ctxt.rntiMaybeUEid, srb_id, ie->value.choice.RRCContainer.size);
-  //for (int i = 0; i < ie->value.choice.RRCContainer.size; i++)
-  //  printf("%02x ", mb->data[i]);
-  //printf("\n");
-  pdcp_data_ind (&ctxt,
-                 1, // srb_flag
-                 0, // embms_flag
-                 srb_id,
-                 ie->value.choice.RRCContainer.size,
-                 mb, NULL, NULL);
+  nr_pdcp_data_ind(&ctxt,
+                   1, // srb_flag
+                   0, // embms_flag
+                   srb_id,
+                   ie->value.choice.RRCContainer.size,
+                   mb,
+                   NULL,
+                   NULL);
   return 0;
 }

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -49,8 +49,7 @@
 #include "common/ngran_types.h"
 #include "common/openairinterface5g_limits.h"
 #include "executables/lte-softmodem.h"
-#include "SIMULATION/ETH_TRANSPORT/proto.h"
-#include "openair2/RRC/NAS/nas_config.h"
+#include "common/utils/tun_if.h"
 #include "intertask_interface.h"
 #include "openair3/S1AP/s1ap_eNB.h"
 #include <pthread.h>
@@ -113,7 +112,7 @@ struct sockaddr_in prose_ctrl_addr;
 struct sockaddr_in prose_pdcp_addr;
 struct sockaddr_in pdcp_sin;
 /* pdcp module parameters and related functions*/
-static pdcp_params_t pdcp_params= {0,NULL};
+static pdcp_params_t pdcp_params = {0};
 rnti_t                 pdcp_UE_UE_module_id_to_rnti[MAX_MOBILES_PER_ENB];
 rnti_t                 pdcp_eNB_UE_instance_to_rnti[MAX_MOBILES_PER_ENB]; // for noS1 mode
 unsigned int           pdcp_eNB_UE_instance_to_rnti_index;
@@ -298,8 +297,8 @@ bool pdcp_data_req(protocol_ctxt_t  *ctxt_pP,
            LOG_UI(PDCP, "Before rlc_data_req 1, srb_flagP: %d, rb_idP: %ld \n", srb_flagP, rb_idP);
       }
 
-      rlc_status = pdcp_params.send_rlc_data_req_func(ctxt_pP, srb_flagP, MBMS_FLAG_YES, rb_idP, muiP,
-                   confirmP, sdu_buffer_sizeP, pdcp_pdu_p,NULL,NULL);
+      rlc_status =
+          rlc_data_req(ctxt_pP, srb_flagP, MBMS_FLAG_YES, rb_idP, muiP, confirmP, sdu_buffer_sizeP, pdcp_pdu_p, NULL, NULL);
     } else {
       rlc_status = RLC_OP_STATUS_OUT_OF_RESSOURCES;
       LOG_E(PDCP,PROTOCOL_CTXT_FMT" PDCP_DATA_REQ SDU DROPPED, OUT OF MEMORY \n",
@@ -467,9 +466,16 @@ bool pdcp_data_req(protocol_ctxt_t  *ctxt_pP,
     if ((pdcp_pdu_p!=NULL) && (srb_flagP == 0) && (ctxt_pP->enb_flag == 1)) {
       LOG_D(PDCP, "pdcp data req on drb %ld, size %d, rnti %lx\n", rb_idP, pdcp_pdu_size, ctxt_pP->rntiMaybeUEid);
 
-      rlc_status = pdcp_params.send_rlc_data_req_func(ctxt_pP, srb_flagP, MBMS_FLAG_NO, rb_idP, muiP,
-                   confirmP, pdcp_pdu_size, pdcp_pdu_p,sourceL2Id,
-                   destinationL2Id);
+      rlc_status = rlc_data_req(ctxt_pP,
+                                srb_flagP,
+                                MBMS_FLAG_NO,
+                                rb_idP,
+                                muiP,
+                                confirmP,
+                                pdcp_pdu_size,
+                                pdcp_pdu_p,
+                                sourceL2Id,
+                                destinationL2Id);
       ret = false;
       switch (rlc_status) {
         case RLC_OP_STATUS_OK:
@@ -2279,63 +2285,38 @@ void rrc_pdcp_config_req (
   }
 }
 
-pdcp_data_ind_func_t get_pdcp_data_ind_func() {
-  return pdcp_params.pdcp_data_ind_func;
-}
-
-void pdcp_set_rlc_data_req_func(send_rlc_data_req_func_t send_rlc_data_req) {
-  pdcp_params.send_rlc_data_req_func = send_rlc_data_req;
-}
-
-void pdcp_set_pdcp_data_ind_func(pdcp_data_ind_func_t pdcp_data_ind) {
-  pdcp_params.pdcp_data_ind_func = pdcp_data_ind;
-}
-
 uint64_t pdcp_module_init( uint64_t pdcp_optmask, int id) {
   /* temporary enforce netlink when UE_NAS_USE_TUN is set,
      this is while switching from noS1 as build option
      to noS1 as config option                               */
   if ( pdcp_optmask & UE_NAS_USE_TUN_BIT) {
-    pdcp_params.optmask = pdcp_params.optmask | PDCP_USE_NETLINK_BIT ;
+    pdcp_params.optmask = pdcp_params.optmask;
   }
 
   pdcp_params.optmask = pdcp_params.optmask | pdcp_optmask ;
-  LOG_I(PDCP, "pdcp init,%s %s\n",
-        ((LINK_ENB_PDCP_TO_GTPV1U)?"usegtp":""),
-        ((PDCP_USE_NETLINK)?"usenetlink":""));
-
-  if (PDCP_USE_NETLINK) {
-    nas_getparams();
-
-    if(UE_NAS_USE_TUN) {
-      int num_if = (NFAPI_MODE == NFAPI_UE_STUB_PNF || IS_SOFTMODEM_SIML1 || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF)? MAX_MOBILES_PER_ENB : 1;
-      netlink_init_tun("ue",num_if, id);
-      if (IS_SOFTMODEM_NOS1)
-        nas_config(1, 1, 2, "ue");
-      netlink_init_mbms_tun("uem", id);
-      nas_config_mbms(1, 2, 2, "uem");
-      LOG_I(PDCP, "UE pdcp will use tun interface\n");
-    } else if(ENB_NAS_USE_TUN) {
-      netlink_init_tun("enb", 1, 0);
-      nas_config(1, 1, 1, "enb");
-      if(pdcp_optmask & ENB_NAS_USE_TUN_W_MBMS_BIT){
-        netlink_init_mbms_tun("enm", 0);
-      	nas_config_mbms(1, 2, 1, "enm"); 
-      	LOG_I(PDCP, "ENB pdcp will use mbms tun interface\n");
-      }
-      LOG_I(PDCP, "ENB pdcp will use tun interface\n");
-    } else {
-      LOG_I(PDCP, "pdcp will use kernel modules\n");
-      netlink_init();
+
+  if (UE_NAS_USE_TUN) {
+    int num_if = (NFAPI_MODE == NFAPI_UE_STUB_PNF || IS_SOFTMODEM_SIML1 || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF) ? MAX_MOBILES_PER_ENB : 1;
+    tun_init("oaitun_ue", num_if, id);
+    if (IS_SOFTMODEM_NOS1)
+      tun_config(1, "10.0.1.2", NULL, "oaitun_ue");
+    tun_init_mbms("oaitun_uem", id + 1);
+    tun_config(1, "10.0.2.2", NULL, "oaitun_uem");
+    LOG_I(PDCP, "UE pdcp will use tun interface\n");
+  } else if (ENB_NAS_USE_TUN) {
+    tun_init("oaitun_enb", 1, 0);
+    tun_config(1, "10.0.1.1", NULL, "oaitun_enb");
+    if (pdcp_optmask & ENB_NAS_USE_TUN_W_MBMS_BIT) {
+      tun_init_mbms("oaitun_enm", 1);
+      tun_config(1, "10.0.2.1", NULL, "oaitun_enm");
+      LOG_I(PDCP, "ENB pdcp will use mbms tun interface\n");
     }
-  }else{
-         if(pdcp_optmask & ENB_NAS_USE_TUN_W_MBMS_BIT){
-             LOG_W(PDCP, "ENB pdcp will use tun interface for MBMS\n");
-             netlink_init_mbms_tun("enm", 0);
-             nas_config_mbms_s1(1, 2, 1, "enm");
-         }else
-             LOG_E(PDCP, "ENB pdcp will not use tun interface\n");
-   }
+    LOG_I(PDCP, "ENB pdcp will use tun interface\n");
+  } else if (pdcp_optmask & ENB_NAS_USE_TUN_W_MBMS_BIT) {
+    tun_init_mbms("oaitun_enm", 0);
+    tun_config(1, "10.0.2.1", NULL, "oaitun_enm");
+    LOG_I(PDCP, "ENB pdcp will use mbms tun interface\n");
+  }
 
   pthread_create(&pdcp_stats_thread_desc,NULL,pdcp_stats_thread,NULL);
 
@@ -2362,7 +2343,7 @@ pdcp_free (
 void pdcp_module_cleanup (void)
 //-----------------------------------------------------------------------------
 {
-  netlink_cleanup();
+  // empty - we could free all contexts, not implemented
 }
 
 //-----------------------------------------------------------------------------

openair2/LAYER2/PDCP_v10.1.0/pdcp.h

@@ -47,43 +47,16 @@
 
 #include "openair3/SECU/secu_defs.h"
 
-typedef rlc_op_status_t (*send_rlc_data_req_func_t)(const protocol_ctxt_t *const,
-                                                    const srb_flag_t,
-                                                    const MBMS_flag_t,
-                                                    const rb_id_t,
-                                                    const mui_t,
-                                                    confirm_t,
-                                                    sdu_size_t,
-                                                    uint8_t *,
-                                                    const uint32_t *const,
-                                                    const uint32_t *const);
-
-typedef bool(pdcp_data_ind_t)(const protocol_ctxt_t *,
-                              const srb_flag_t,
-                              const MBMS_flag_t,
-                              const rb_id_t,
-                              const sdu_size_t,
-                              uint8_t *,
-                              const uint32_t *const,
-                              const uint32_t *const);
-typedef pdcp_data_ind_t* pdcp_data_ind_func_t;
-
 #define MAX_NUMBER_NETIF                 1 //16
 #define ENB_NAS_USE_TUN_W_MBMS_BIT      (1<< 10)
-#define PDCP_USE_NETLINK_BIT            (1<< 11)
-#define LINK_ENB_PDCP_TO_IP_DRIVER_BIT  (1<< 13)
 #define LINK_ENB_PDCP_TO_GTPV1U_BIT     (1<< 14)
 #define UE_NAS_USE_TUN_BIT              (1<< 15)
 #define ENB_NAS_USE_TUN_BIT             (1<< 16)
 typedef struct {
   uint64_t optmask;
-  send_rlc_data_req_func_t send_rlc_data_req_func;
-  pdcp_data_ind_func_t pdcp_data_ind_func;
 } pdcp_params_t;
 
 
-#define PDCP_USE_NETLINK          ( get_pdcp_optmask() & PDCP_USE_NETLINK_BIT)
-#define LINK_ENB_PDCP_TO_IP_DRIVER  ( get_pdcp_optmask() & LINK_ENB_PDCP_TO_IP_DRIVER_BIT)
 #define LINK_ENB_PDCP_TO_GTPV1U     ( get_pdcp_optmask() & LINK_ENB_PDCP_TO_GTPV1U_BIT)
 #define UE_NAS_USE_TUN              ( get_pdcp_optmask() & UE_NAS_USE_TUN_BIT)
 #define ENB_NAS_USE_TUN             ( get_pdcp_optmask() & ENB_NAS_USE_TUN_BIT)
@@ -279,7 +252,7 @@ bool cu_f1u_data_req(protocol_ctxt_t  *ctxt_pP,
                      const uint32_t *const sourceL2Id,
                      const uint32_t *const destinationL2Id);
 
-/*! \fn bool pdcp_data_ind(const protocol_ctxt_t* const, srb_flag_t, MBMS_flag_t, rb_id_t, sdu_size_t, uint8_t*, bool)
+/*! \fn bool pdcp_data_ind(const protocol_ctxt_t* const, srb_flag_t, MBMS_flag_t, rb_id_t, sdu_size_t, uint8_t*, uint32_t, uint32_t)
  * \brief This functions handles data transfer indications coming from RLC
  * \param[in] ctxt_pP        Running context.
  * \param[in] Shows if rb is SRB
@@ -287,12 +260,20 @@ bool cu_f1u_data_req(protocol_ctxt_t  *ctxt_pP,
  * \param[in] rab_id Radio Bearer ID
  * \param[in] sdu_buffer_size Size of incoming SDU in bytes
  * \param[in] sdu_buffer Buffer carrying SDU
- * \param[in] is_data_plane flag to indicate whether the userplane data belong to the control plane or data plane
+ * \param[in] srcID
+ * \param[in] dstID
  * \return TRUE on success, false otherwise
  * \note None
  * @ingroup _pdcp
  */
-pdcp_data_ind_t pdcp_data_ind;
+bool pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP,
+                   const srb_flag_t srb_flagP,
+                   const MBMS_flag_t MBMS_flagP,
+                   const rb_id_t rb_idP,
+                   const sdu_size_t sdu_buffer_sizeP,
+                   uint8_t *const sdu_buffer_pP,
+                   const uint32_t *const srcID,
+                   const uint32_t *const dstID);
 
 /*! \fn void rrc_pdcp_config_req(const protocol_ctxt_t* const ,uint32_t,rb_id_t,uint8_t)
 * \brief This functions initializes relevant PDCP entity
@@ -381,9 +362,6 @@ int pdcp_fifo_flush_sdus                      ( const protocol_ctxt_t *const  ct
 int pdcp_fifo_read_input_sdus_remaining_bytes ( const protocol_ctxt_t *const  ctxt_pP);
 int pdcp_fifo_read_input_sdus                 ( const protocol_ctxt_t *const  ctxt_pP);
 void pdcp_fifo_read_input_sdus_from_otg       ( const protocol_ctxt_t *const  ctxt_pP);
-void pdcp_set_rlc_data_req_func(send_rlc_data_req_func_t send_rlc_data_req);
-void pdcp_set_pdcp_data_ind_func(pdcp_data_ind_func_t pdcp_data_ind);
-pdcp_data_ind_func_t get_pdcp_data_ind_func(void);
 //-----------------------------------------------------------------------------
 int pdcp_fifo_flush_mbms_sdus                      ( const protocol_ctxt_t *const  ctxt_pP);
 int pdcp_fifo_read_input_mbms_sdus_fromtun       ( const protocol_ctxt_t *const  ctxt_pP);

openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c

@@ -31,8 +31,6 @@
 
 #define PDCP_FIFO_C
 
-
-
 extern int otg_enabled;
 
 #include "pdcp.h"
@@ -49,7 +47,6 @@ extern int otg_enabled;
 
 #include "../MAC/mac_extern.h"
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
-#include "NETWORK_DRIVER/LITE/constant.h"
 //#include "SIMULATION/ETH_TRANSPORT/extern.h"
 #include "common/utils/LOG/log.h"
 #include "UTIL/OTG/otg_tx.h"
@@ -63,23 +60,12 @@ extern int otg_enabled;
 
 #include <sys/socket.h>
 #include <linux/netlink.h>
-#include "NETWORK_DRIVER/UE_IP/constant.h"
-
-extern char nl_rx_buf[NL_MAX_PAYLOAD];
-extern struct sockaddr_nl nas_src_addr, nas_dest_addr;
-extern struct nlmsghdr *nas_nlh_tx;
-extern struct nlmsghdr *nas_nlh_rx;
-extern struct iovec nas_iov_tx;
-extern struct iovec nas_iov_rx;
 
 extern int nas_sock_fd[MAX_MOBILES_PER_ENB];
 
 extern int nas_sock_mbms_fd;
 
-extern struct msghdr nas_msg_tx;
-extern struct msghdr nas_msg_rx;
-
-
+static char nl_rx_buf[NL_MAX_PAYLOAD];
 
 #  include "openair3/ocp-gtpu/gtp_itf.h"
 
@@ -136,12 +122,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t *const  ctxt_pP) {
 	log_dump(PDCP, pdcpData, pdcpHead->data_size, LOG_DUMP_CHAR,"PDCP output to be sent to TUN interface: \n");
       ret = write(nas_sock_fd[0], pdcpData, pdcpHead->data_size);
        LOG_T(PDCP,"[NB PDCP_FIFOS] ret %d TRIED TO PUSH DATA TO rb_id %d handle %d sizeToWrite %d\n",ret,rb_id,nas_sock_fd[0],pdcpHead->data_size);
-    } else if (PDCP_USE_NETLINK) {
-      int sizeToWrite= sizeof (pdcp_data_ind_header_t) + pdcpHead->data_size;
-      memcpy(NLMSG_DATA(nas_nlh_tx), (uint8_t *) pdcpHead,  sizeToWrite);
-      nas_nlh_tx->nlmsg_len = sizeToWrite;
-      ret = sendmsg(nas_sock_fd[0],&nas_msg_tx,0);
-    }  //  PDCP_USE_NETLINK
+    }
     
     AssertFatal(ret >= 0,"[PDCP_FIFOS] pdcp_fifo_flush_sdus (errno: %d %s), nas_sock_fd[0]: %d\n", errno, strerror(errno), nas_sock_fd[0]);
 
@@ -418,13 +399,14 @@ int pdcp_fifo_read_input_sdus_fromnetlinksock (const protocol_ctxt_t *const  ctx
     rb_id_t          rab_id  = 0;
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PDCP_FIFO_READ, 1 );
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PDCP_FIFO_READ_BUFFER, 1 );
+    struct msghdr nas_msg_rx;
     len = recvmsg(nas_sock_fd[0], &nas_msg_rx, 0);
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PDCP_FIFO_READ_BUFFER, 0 );
 
     if (len > 0) {
-      for (nas_nlh_rx = (struct nlmsghdr *) nl_rx_buf;
-           NLMSG_OK (nas_nlh_rx, len);
-           nas_nlh_rx = NLMSG_NEXT (nas_nlh_rx, len)) {
+      for (struct nlmsghdr *nas_nlh_rx = (struct nlmsghdr *)nl_rx_buf;
+           NLMSG_OK(nas_nlh_rx, len);
+           nas_nlh_rx = NLMSG_NEXT(nas_nlh_rx, len)) {
         if (nas_nlh_rx->nlmsg_type == NLMSG_DONE) {
           LOG_D(PDCP, "[PDCP][NETLINK] RX NLMSG_DONE\n");
           //return;
@@ -526,7 +508,7 @@ int pdcp_fifo_read_input_sdus_fromnetlinksock (const protocol_ctxt_t *const  ctx
             ctxt.rntiMaybeUEid = pdcp_UE_UE_module_id_to_rnti[ctxt.module_id];
 
             if (rab_id != 0) {
-              if (rab_id == UE_IP_DEFAULT_RAB_ID) {
+              if (rab_id == 1) {
                 LOG_D(PDCP, "PDCP_COLL_KEY_DEFAULT_DRB_VALUE(module_id=%d, rnti=%lx, enb_flag=%d)\n", ctxt.module_id, ctxt.rntiMaybeUEid, ctxt.enb_flag);
                 key = PDCP_COLL_KEY_DEFAULT_DRB_VALUE(ctxt.module_id, ctxt.rntiMaybeUEid, ctxt.enb_flag);
                 h_rc = hashtable_get(pdcp_coll_p, key, (void **)&pdcp_p);
@@ -700,7 +682,7 @@ void pdcp_fifo_read_input_sdus_frompc5s (const protocol_ctxt_t *const  ctxt_pP)
         //UE
         if (!ctxt.enb_flag) {
           if (rab_id != 0) {
-            if (rab_id == UE_IP_DEFAULT_RAB_ID) {
+            if (rab_id == 1) {
               LOG_D(PDCP, "PDCP_COLL_KEY_DEFAULT_DRB_VALUE(module_id=%d, rnti=%lx, enb_flag=%d)\n", ctxt.module_id, ctxt.rntiMaybeUEid, ctxt.enb_flag);
               key = PDCP_COLL_KEY_DEFAULT_DRB_VALUE(ctxt.module_id, ctxt.rntiMaybeUEid, ctxt.enb_flag);
               h_rc = hashtable_get(pdcp_coll_p, key, (void **)&pdcp_p);
@@ -807,15 +789,10 @@ void pdcp_fifo_read_input_sdus_frompc5s (const protocol_ctxt_t *const  ctxt_pP)
 } /* pdcp_fifo_read_input_sdus_frompc5s */
 
 //-----------------------------------------------------------------------------
-int pdcp_fifo_read_input_sdus (const protocol_ctxt_t *const  ctxt_pP) {
-  if (UE_NAS_USE_TUN || ENB_NAS_USE_TUN) {
-    return pdcp_fifo_read_input_sdus_fromtun (ctxt_pP);
-  } else if (PDCP_USE_NETLINK) {
-    pdcp_fifo_read_input_sdus_frompc5s (ctxt_pP);
-    return pdcp_fifo_read_input_sdus_fromnetlinksock(ctxt_pP);
-  } /* PDCP_USE_NETLINK */
-
-  return 0;
+int pdcp_fifo_read_input_sdus(const protocol_ctxt_t *const ctxt_pP)
+{
+  DevAssert(UE_NAS_USE_TUN || ENB_NAS_USE_TUN);
+  return pdcp_fifo_read_input_sdus_fromtun(ctxt_pP);
 }
 
 //TTN for D2D (PC5S)

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -367,14 +367,14 @@ static void enqueue_pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP,
   if (pthread_mutex_unlock(&pq.m) != 0) abort();
 }
 
-bool pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP,
-                   const srb_flag_t srb_flagP,
-                   const MBMS_flag_t MBMS_flagP,
-                   const rb_id_t rb_id,
-                   const sdu_size_t sdu_buffer_size,
-                   uint8_t *const sdu_buffer,
-                   const uint32_t *const srcID,
-                   const uint32_t *const dstID)
+bool nr_pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP,
+                      const srb_flag_t srb_flagP,
+                      const MBMS_flag_t MBMS_flagP,
+                      const rb_id_t rb_id,
+                      const sdu_size_t sdu_buffer_size,
+                      uint8_t *const sdu_buffer,
+                      const uint32_t *const srcID,
+                      const uint32_t *const dstID)
 {
   enqueue_pdcp_data_ind(ctxt_pP,
                         srb_flagP,
@@ -594,7 +594,7 @@ void nr_pdcp_layer_init(bool uses_e1)
 
 #include "nfapi/oai_integration/vendor_ext.h"
 #include "executables/lte-softmodem.h"
-#include "openair2/RRC/NAS/nas_config.h"
+#include "common/utils/tun_if.h"
 
 uint64_t nr_pdcp_module_init(uint64_t _pdcp_optmask, int id)
 {
@@ -608,48 +608,29 @@ uint64_t nr_pdcp_module_init(uint64_t _pdcp_optmask, int id)
   initialized = 1;
   if (pthread_mutex_unlock(&m) != 0) abort();
 
-#if 0
-  pdcp_optmask = _pdcp_optmask;
-  return pdcp_optmask;
-#endif
-  /* temporary enforce netlink when UE_NAS_USE_TUN is set,
-     this is while switching from noS1 as build option
-     to noS1 as config option                               */
-  if ( _pdcp_optmask & UE_NAS_USE_TUN_BIT) {
-    pdcp_optmask = pdcp_optmask | PDCP_USE_NETLINK_BIT ;
-  }
-
   pdcp_optmask = pdcp_optmask | _pdcp_optmask ;
-  LOG_I(PDCP, "pdcp init,%s %s\n",
-        ((LINK_ENB_PDCP_TO_GTPV1U)?"usegtp":""),
-        ((PDCP_USE_NETLINK)?"usenetlink":""));
-
-  if (PDCP_USE_NETLINK) {
-    nas_getparams();
-
-    if(UE_NAS_USE_TUN) {
-      char *ifsuffix_ue = get_softmodem_params()->nsa ? "nrue" : "ue";
-      int num_if = (NFAPI_MODE == NFAPI_UE_STUB_PNF || IS_SOFTMODEM_SIML1 || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF)? MAX_MOBILES_PER_ENB : 1;
-      netlink_init_tun(ifsuffix_ue, num_if, id);
-      //Add --nr-ip-over-lte option check for next line
-      if (IS_SOFTMODEM_NOS1){
-        nas_config(1, 1, !get_softmodem_params()->nsa ? 2 : 3, ifsuffix_ue);
-        set_qfi_pduid(7, 10);
-      }
-      LOG_I(PDCP, "UE pdcp will use tun interface\n");
-      start_pdcp_tun_ue();
-    } else if(ENB_NAS_USE_TUN) {
-      char *ifsuffix_base_s = get_softmodem_params()->nsa ? "gnb" : "enb";
-      netlink_init_tun(ifsuffix_base_s, 1, id);
-      nas_config(1, 1, 1, ifsuffix_base_s);
-      LOG_I(PDCP, "ENB pdcp will use tun interface\n");
-      start_pdcp_tun_enb();
-    } else {
-      LOG_I(PDCP, "pdcp will use kernel modules\n");
-      abort();
-      netlink_init();
+
+  if (UE_NAS_USE_TUN) {
+    char *ifprefix = get_softmodem_params()->nsa ? "oaitun_nrue" : "oaitun_ue";
+    int num_if = (NFAPI_MODE == NFAPI_UE_STUB_PNF || IS_SOFTMODEM_SIML1 || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF)
+                     ? MAX_MOBILES_PER_ENB
+                     : 1;
+    tun_init(ifprefix, num_if, id);
+    if (IS_SOFTMODEM_NOS1) {
+      const char *ip = !get_softmodem_params()->nsa ? "10.0.1.2" : "10.0.1.3";
+      tun_config(1, ip, NULL, ifprefix);
+      set_qfi_pduid(7, 10);
     }
+    LOG_I(PDCP, "UE pdcp will use tun interface\n");
+    start_pdcp_tun_ue();
+  } else if (ENB_NAS_USE_TUN) {
+    char *ifprefix = get_softmodem_params()->nsa ? "oaitun_gnb" : "oaitun_enb";
+    tun_init(ifprefix, 1, id);
+    tun_config(1, "10.0.1.1", NULL, ifprefix);
+    LOG_I(PDCP, "ENB pdcp will use tun interface\n");
+    start_pdcp_tun_enb();
   }
+
   return pdcp_optmask ;
 }
 
@@ -1313,7 +1294,7 @@ bool cu_f1u_data_req(protocol_ctxt_t  *ctxt_pP,
     exit(1);
   }
   memcpy(memblock, sdu_buffer, sdu_buffer_size);
-  int ret=pdcp_data_ind(ctxt_pP,srb_flagP, false, rb_id, sdu_buffer_size, memblock, NULL, NULL);
+  int ret = nr_pdcp_data_ind(ctxt_pP, srb_flagP, false, rb_id, sdu_buffer_size, memblock, NULL, NULL);
   if (!ret) {
     LOG_E(RLC, "%s:%d:%s: ERROR: pdcp_data_ind failed\n", __FILE__, __LINE__, __FUNCTION__);
     /* what to do in case of failure? for the moment: nothing */
@@ -1337,16 +1318,6 @@ bool pdcp_data_req(protocol_ctxt_t  *ctxt_pP,
   return false;
 }
 
-void pdcp_set_pdcp_data_ind_func(pdcp_data_ind_func_t pdcp_data_ind)
-{
-  /* nothing to do */
-}
-
-void pdcp_set_rlc_data_req_func(send_rlc_data_req_func_t send_rlc_data_req)
-{
-  /* nothing to do */
-}
-
 //Dummy function needed due to LTE dependencies
 void
 pdcp_mbms_run ( const protocol_ctxt_t *const  ctxt_pP){

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h

@@ -37,14 +37,14 @@ void du_rlc_data_req(const protocol_ctxt_t *const ctxt_pP,
                      sdu_size_t sdu_sizeP,
                      uint8_t *sdu_pP);
 
-bool pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP,
-                   const srb_flag_t srb_flagP,
-                   const MBMS_flag_t MBMS_flagP,
-                   const rb_id_t rb_id,
-                   const sdu_size_t sdu_buffer_size,
-                   uint8_t *const sdu_buffer,
-                   const uint32_t *const srcID,
-                   const uint32_t *const dstID);
+bool nr_pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP,
+                      const srb_flag_t srb_flagP,
+                      const MBMS_flag_t MBMS_flagP,
+                      const rb_id_t rb_id,
+                      const sdu_size_t sdu_buffer_size,
+                      uint8_t *const sdu_buffer,
+                      const uint32_t *const srcID,
+                      const uint32_t *const dstID);
 
 void nr_pdcp_add_drbs(eNB_flag_t enb_flag,
                       ue_id_t UEid,

openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c

@@ -519,7 +519,7 @@ rb_found:
   }
   memcpy(memblock, buf, size);
   LOG_D(PDCP, "Calling PDCP layer from RLC in %s\n", __FUNCTION__);
-  if (!pdcp_data_ind(&ctx, is_srb, 0, rb_id, size, memblock, NULL, NULL)) {
+  if (!nr_pdcp_data_ind(&ctx, is_srb, 0, rb_id, size, memblock, NULL, NULL)) {
     LOG_E(RLC, "%s:%d:%s: ERROR: pdcp_data_ind failed\n", __FILE__, __LINE__, __FUNCTION__);
     /* what to do in case of failure? for the moment: nothing */
   }

openair2/LAYER2/rlc_v2/rlc_oai_api.c

@@ -418,7 +418,7 @@ rb_found:
     exit(1);
   }
   memcpy(memblock, buf, size);
-  if (!get_pdcp_data_ind_func()(&ctx, is_srb, is_mbms, rb_id, size, memblock, NULL, NULL)) {
+  if (!pdcp_data_ind(&ctx, is_srb, is_mbms, rb_id, size, memblock, NULL, NULL)) {
     LOG_E(RLC, "%s:%d:%s: ERROR: pdcp_data_ind failed (is_srb %d rb_id %d rnti %d)\n",
           __FILE__, __LINE__, __FUNCTION__,
           is_srb, rb_id, ue->rnti);

openair2/NETWORK_DRIVER/LITE/RB_TOOL/Makefile

-CC = gcc
-
-NAS_DIR = ..
-
-rb_tool: rb_tool.c
-	$(CC) rb_tool.c -o rb_tool  -I../ -g -ggdb
-
-all:    rb_tool
-
-clean:
-	rm rb_tool

openair2/NETWORK_DRIVER/LITE/classifier.c

-/*
- * 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
- */
-
-/*! \file classifier.c
-* \brief Classify IP packets
-* \author  Navid Nikaein, Lionel GAUTHIER,  Raymond knopp
-* \company Eurecom
-* \email:  navid.nikaein@eurecom.fr, lionel.gauthier@eurecom.fr, knopp@eurecom.fr
-*/
-
-
-#include "local.h"
-#include "proto_extern.h"
-#include <net/ip6_fib.h>
-#include <net/route.h>
-#ifdef MPLS
-#include <net/mpls.h>
-#endif
-
-
-#define IN_CLASSA(a)            ((((long int) (a)) & 0x80000000) == 0)
-#define IN_CLASSB(a)            ((((long int) (a)) & 0xc0000000) == 0x80000000)
-#define IN_CLASSC(a)            ((((long int) (a)) & 0xe0000000) == 0xc0000000)
-#define IN_CLASSD(a)            ((((long int) (a)) & 0xf0000000) == 0xe0000000)
-#define IN_MULTICAST(a)         IN_CLASSD(a)
-#define IN_EXPERIMENTAL(a)      ((((long int) (a)) & 0xf0000000) == 0xf0000000)
-#define IN_BADCLASS(a)          IN_EXPERIMENTAL((a))
-/* Address to accept any incoming messages. */
-#define INADDR_ANY              ((unsigned long int) 0x00000000)
-/* Address to send to all hosts. */
-#define INADDR_BROADCAST        ((unsigned long int) 0xffffffff)
-/* Address indicating an error return. */
-#define INADDR_NONE             ((unsigned long int) 0xffffffff)
-
-
-#define NIPADDR(addr) \
-        (uint8_t)(addr & 0x000000FF), \
-        (uint8_t)((addr & 0x0000FF00) >> 8), \
-        (uint8_t)((addr & 0x00FF0000) >> 16), \
-        (uint8_t)((addr & 0xFF000000) >> 24)
-
-#define NIP6ADDR(addr) \
-        ntohs((addr)->s6_addr16[0]), \
-        ntohs((addr)->s6_addr16[1]), \
-        ntohs((addr)->s6_addr16[2]), \
-        ntohs((addr)->s6_addr16[3]), \
-        ntohs((addr)->s6_addr16[4]), \
-        ntohs((addr)->s6_addr16[5]), \
-        ntohs((addr)->s6_addr16[6]), \
-        ntohs((addr)->s6_addr16[7])
-
-
-#define IN6_IS_ADDR_UNSPECIFIED(a) \
-        (((__const uint32_t *) (a))[0] == 0                                   \
-         && ((__const uint32_t *) (a))[1] == 0                                \
-         && ((__const uint32_t *) (a))[2] == 0                                \
-         && ((__const uint32_t *) (a))[3] == 0)
-
-#define IN6_IS_ADDR_LOOPBACK(a) \
-        (((__const uint32_t *) (a))[0] == 0                                   \
-         && ((__const uint32_t *) (a))[1] == 0                                \
-         && ((__const uint32_t *) (a))[2] == 0                                \
-         && ((__const uint32_t *) (a))[3] == htonl (1))
-
-#define IN6_IS_ADDR_MULTICAST(a) (((__const uint8_t *) (a))[0] == 0xff)
-
-#define IN6_IS_ADDR_LINKLOCAL(a) \
-        ((((__const uint32_t *) (a))[0] & htonl (0xffc00000))                 \
-         == htonl (0xfe800000))
-
-#define IN6_IS_ADDR_SITELOCAL(a) \
-        ((((__const uint32_t *) (a))[0] & htonl (0xffc00000))                 \
-         == htonl (0xfec00000))
-
-#define IN6_IS_ADDR_V4MAPPED(a) \
-        ((((__const uint32_t *) (a))[0] == 0)                                 \
-         && (((__const uint32_t *) (a))[1] == 0)                              \
-         && (((__const uint32_t *) (a))[2] == htonl (0xffff)))
-
-#define IN6_IS_ADDR_V4COMPAT(a) \
-        ((((__const uint32_t *) (a))[0] == 0)                                 \
-         && (((__const uint32_t *) (a))[1] == 0)                              \
-         && (((__const uint32_t *) (a))[2] == 0)                              \
-         && (ntohl (((__const uint32_t *) (a))[3]) > 1))
-
-#define IN6_ARE_ADDR_EQUAL(a,b) \
-        ((((__const uint32_t *) (a))[0] == ((__const uint32_t *) (b))[0])     \
-         && (((__const uint32_t *) (a))[1] == ((__const uint32_t *) (b))[1])  \
-         && (((__const uint32_t *) (a))[2] == ((__const uint32_t *) (b))[2])  \
-         && (((__const uint32_t *) (a))[3] == ((__const uint32_t *) (b))[3]))
-
-#define IN6_IS_ADDR_MC_NODELOCAL(a) \
-        (IN6_IS_ADDR_MULTICAST(a)                                             \
-         && ((((__const uint8_t *) (a))[1] & 0xf) == 0x1))
-
-#define IN6_IS_ADDR_MC_LINKLOCAL(a) \
-        (IN6_IS_ADDR_MULTICAST(a)                                             \
-         && ((((__const uint8_t *) (a))[1] & 0xf) == 0x2))
-
-#define IN6_IS_ADDR_MC_SITELOCAL(a) \
-        (IN6_IS_ADDR_MULTICAST(a)                                             \
-         && ((((__const uint8_t *) (a))[1] & 0xf) == 0x5))
-
-#define IN6_IS_ADDR_MC_ORGLOCAL(a) \
-        (IN6_IS_ADDR_MULTICAST(a)                                             \
-         && ((((__const uint8_t *) (a))[1] & 0xf) == 0x8))
-
-#define IN6_IS_ADDR_MC_GLOBAL(a) \
-        (IN6_IS_ADDR_MULTICAST(a)                                             \
-         && ((((__const uint8_t *) (a))[1] & 0xf) == 0xe))
-
-#define IN6_ARE_ADDR_MASKED_EQUAL(a,b,m) \
-           (((((__const uint32_t *) (a))[0] & (((__const uint32_t *) (m))[0])) == (((__const uint32_t *) (b))[0] & (((__const uint32_t *) (m))[0])))  \
-         && ((((__const uint32_t *) (a))[1] & (((__const uint32_t *) (m))[1])) == (((__const uint32_t *) (b))[1] & (((__const uint32_t *) (m))[1])))  \
-         && ((((__const uint32_t *) (a))[2] & (((__const uint32_t *) (m))[2])) == (((__const uint32_t *) (b))[2] & (((__const uint32_t *) (m))[2])))  \
-         && ((((__const uint32_t *) (a))[3] & (((__const uint32_t *) (m))[3])) == (((__const uint32_t *) (b))[3] & (((__const uint32_t *) (m))[3]))))
-
-#define IN_ARE_ADDR_MASKED_EQUAL(a,b,m) \
-           (((((__const uint8_t *) (a))[0] & (((__const uint8_t *) (m))[0])) == (((__const uint8_t *) (b))[0] & (((__const uint8_t *) (m))[0])))  \
-         && ((((__const uint8_t *) (a))[1] & (((__const uint8_t *) (m))[1])) == (((__const uint8_t *) (b))[1] & (((__const uint8_t *) (m))[1])))  \
-         && ((((__const uint8_t *) (a))[2] & (((__const uint8_t *) (m))[2])) == (((__const uint8_t *) (b))[2] & (((__const uint8_t *) (m))[2])))  \
-         && ((((__const uint8_t *) (a))[3] & (((__const uint8_t *) (m))[3])) == (((__const uint8_t *) (b))[3] & (((__const uint8_t *) (m))[3]))))
-
-
-//---------------------------------------------------------------------------
-// Find the IP traffic type (UNICAST, MULTICAST, BROADCAST)
-ip_traffic_type_t oai_nw_drv_find_traffic_type(struct sk_buff  *skb)
-{
-  //---------------------------------------------------------------------------
-  ip_traffic_type_t            traffic_type = TRAFFIC_IPVX_TYPE_UNKNOWN;
-
-  if (skb!=NULL) {
-    switch (ntohs(skb->protocol))  {
-    case ETH_P_IPV6:
-      traffic_type = TRAFFIC_IPV6_TYPE_UNKNOWN;
-#ifdef OAI_DRV_DEBUG_CLASS
-      printk("SOURCE ADDR %X:%X:%X:%X:%X:%X:%X:%X",NIP6ADDR(&(ipv6_hdr(skb)->saddr)));
-      printk("    DEST   ADDR %X:%X:%X:%X:%X:%X:%X:%X\n",NIP6ADDR(&(ipv6_hdr(skb)->daddr)));
-#endif
-
-      if (IN6_IS_ADDR_MULTICAST(&ipv6_hdr(skb)->daddr.in6_u.u6_addr32[0])) {
-        traffic_type = TRAFFIC_IPV6_TYPE_MULTICAST;
-
-      } else {
-        traffic_type = TRAFFIC_IPV6_TYPE_UNICAST;
-      }
-
-      break;
-
-
-    case ETH_P_IP:
-      traffic_type = TRAFFIC_IPV4_TYPE_UNKNOWN;
-
-      //print_TOOL_pk_ipv4((struct iphdr *)skb->network_header);
-      if (IN_MULTICAST(htonl(ip_hdr(skb)->daddr))) {
-        traffic_type = TRAFFIC_IPV4_TYPE_MULTICAST;
-      } else {
-        traffic_type = TRAFFIC_IPV4_TYPE_UNICAST;
-      }
-
-      // TO DO BROADCAST
-
-      break;
-
-    case ETH_P_ARP:
-      traffic_type = TRAFFIC_IPV4_TYPE_BROADCAST;
-      break;
-
-    default:
-      ;
-    }
-  }
-
-  return traffic_type;
-}
-

openair2/NETWORK_DRIVER/LITE/constant.h

-/*
- * 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
- */
-
-#ifndef _OAI_NW_DRV_CST
-#define _OAI_NW_DRV_CST
-
-#define MAX_MEASURE_NB 5
-#define OAI_NW_DRV_MAX_LENGTH 180
-
-//Debug flags
-//#define OAI_NW_DRV_DEBUG_DC
-#define OAI_NW_DRV_DEBUG_SEND
-#define OAI_NW_DRV_DEBUG_RECEIVE
-//#define OAI_NW_DRV_DEBUG_CLASS
-//#define OAI_NW_DRV_DEBUG_GC
-//#define OAI_NW_DRV_DEBUG_DC_MEASURE
-//#define OAI_NW_DRV_DEBUG_TIMER
-//#define OAI_NW_DRV_DEBUG_DEVICE
-//#define OAI_NW_DRV_DEBUG_INTERRUPT
-//#define OAI_NW_DRV_DEBUG_TOOL
-
-// Other flags
-#define DEMO_3GSM
-
-// General Constants
-#define OAI_NW_DRV_MTU                    1500
-#define OAI_NW_DRV_TX_QUEUE_LEN           100
-#define OAI_NW_DRV_ADDR_LEN               8
-#define OAI_NW_DRV_INET6_ADDRSTRLEN       46
-#define OAI_NW_DRV_INET_ADDRSTRLEN        16
-
-#define OAI_NW_DRV_RESET_RX_FLAGS         0
-
-#define OAI_NW_DRV_CX_MAX                 32  //Identical to RRC constant
-//#define OAI_NW_DRV_CX_MULTICAST_ALLNODE 2
-
-#define OAI_NW_DRV_RETRY_LIMIT_DEFAULT    5
-
-#define OAI_NW_DRV_MESSAGE_MAXLEN         5004
-
-#define OAI_NW_DRV_SIG_SRB3               3
-#define OAI_NW_DRV_SIG_SRB4               3 // not used yet
-
-//peer-to-peer messages between NAS entities
-#define OAI_NW_DRV_CMD_OPEN_RB            1
-
-//#define OAI_NW_DRV_IID1_CONTROL 0x0
-//#define OAI_NW_DRV_IID2_CONTROL __constant_htonl(0xffffffff)
-
-//#define OAI_NW_DRV_STATE_IDLE                        0
-//#define OAI_NW_DRV_STATE_CONNECTED                   1
-//#define OAI_NW_DRV_STATE_ESTABLISHMENT_REQUEST       2
-//#define OAI_NW_DRV_STATE_ESTABLISHMENT_FAILURE       3
-//#define OAI_NW_DRV_STATE_RELEASE_FAILURE             4
-#define OAI_NW_DRV_CX_RELEASE_UNDEF_CAUSE 1
-
-// MT+RG NAS States
-#define OAI_NW_DRV_IDLE                  0x01
-// Connection
-#define OAI_NW_DRV_CX_FACH               0x06
-#define OAI_NW_DRV_CX_DCH                0x0A
-#define OAI_NW_DRV_CX_RECEIVED           0x10
-#define OAI_NW_DRV_CX_CONNECTING         0x04
-#define OAI_NW_DRV_CX_RELEASING          0x08
-#define OAI_NW_DRV_CX_CONNECTING_FAILURE 0x14
-#define OAI_NW_DRV_CX_RELEASING_FAILURE  0x18
-// Radio Bearers
-#define OAI_NW_DRV_RB_ESTABLISHING       0x24
-#define OAI_NW_DRV_RB_RELEASING          0x28
-#define OAI_NW_DRV_RB_DCH                0x2A
-
-
-#define OAI_NW_DRV_TIMER_ESTABLISHMENT_DEFAULT 12
-#define OAI_NW_DRV_TIMER_RELEASE_DEFAULT       2
-#define OAI_NW_DRV_TIMER_IDLE                  UINT_MAX
-#define OAI_NW_DRV_TIMER_TICK                  HZ
-
-#define OAI_NW_DRV_PDCPH_SIZE                  sizeof(struct pdcp_data_req_header_s)
-#define OAI_NW_DRV_IPV4_SIZE                   20
-#define OAI_NW_DRV_IPV6_SIZE                   40
-
-#define OAI_NW_DRV_DIRECTION_SEND              0
-#define OAI_NW_DRV_DIRECTION_RECEIVE           1
-#define OAI_NW_DRV_DIRECTION_FORWARD           2
-
-// function number
-#define OAI_NW_DRV_FCT_DEL_SEND                1
-#define OAI_NW_DRV_FCT_QOS_SEND                2
-#define OAI_NW_DRV_FCT_DC_SEND                 3
-#define OAI_NW_DRV_FCT_CTL_SEND                4
-
-// type of IOCTL command
-#define OAI_NW_DRV_IOCTL_RRM 0x89F0
-
-// Error cause
-#define OAI_NW_DRV_ERROR_ALREADYEXIST          1
-#define OAI_NW_DRV_ERROR_NOMEMORY              3
-#define OAI_NW_DRV_ERROR_NOTMT                 9
-#define OAI_NW_DRV_ERROR_NOTRG                 10
-#define OAI_NW_DRV_ERROR_NOTIDLE               11
-#define OAI_NW_DRV_ERROR_NOTCONNECTED          12
-#define OAI_NW_DRV_ERROR_NORB                  14
-#define OAI_NW_DRV_ERROR_NOTCORRECTVALUE       32
-#define OAI_NW_DRV_ERROR_NOTCORRECTLCR         33
-#define OAI_NW_DRV_ERROR_NOTCORRECTDIR         34
-#define OAI_NW_DRV_ERROR_NOTCORRECTDSCP        35
-#define OAI_NW_DRV_ERROR_NOTCORRECTVERSION     36
-#define OAI_NW_DRV_ERROR_NOTCORRECTRABI        37
-
-
-/**********************************************************/
-/* Constants related with IP protocols                    */
-/**********************************************************/
-
-//#define OAI_NW_DRV_PORT_CONTROL __constant_htons(0xc45)
-//#define OAI_NW_DRV_PORT_AUTHENTICATION __constant_htons(1811)
-
-#define OAI_NW_DRV_TRAFFICCLASS_MASK  __constant_htonl(0x0fc00000)
-
-// Network control codepoint 111000 + IP version 6
-#define OAI_NW_DRV_FLOWINFO_NCONTROL  __constant_htonl(0x6e000000)
-// network control codepoint 111000
-#define OAI_NW_DRV_DSCP_NCONTROL      56   //0x38
-// default codepoint 1000000
-#define OAI_NW_DRV_DSCP_DEFAULT       64
-#define OAI_NW_DRV_DSCP_MAX           193
-
-#define OAI_NW_DRV_PROTOCOL_DEFAULT   0
-#define OAI_NW_DRV_PROTOCOL_TCP       IPPROTO_TCP
-#define OAI_NW_DRV_PROTOCOL_UDP       IPPROTO_UDP
-#define OAI_NW_DRV_PROTOCOL_ICMP4     IPPROTO_ICMP
-#define OAI_NW_DRV_PROTOCOL_ICMP6     IPPROTO_ICMPV6
-//#warning "OAI_NW_DRV_PROTOCOL_ARP value 200 may collide with new defined values in kernel"
-#define OAI_NW_DRV_PROTOCOL_ARP       200
-
-#define OAI_NW_DRV_PORT_DEFAULT       __constant_htons(65535)
-#define OAI_NW_DRV_PORT_HTTP          __constant_htons(80)
-
-#define OAI_NW_DRV_IP_VERSION_ALL        0
-#define OAI_NW_DRV_IP_VERSION_4          4
-#define OAI_NW_DRV_IP_VERSION_6          6
-
-#define OAI_NW_DRV_DEFAULT_IPV4_ADDR  0
-#define OAI_NW_DRV_DEFAULT_IPV6_ADDR0 0
-#define OAI_NW_DRV_DEFAULT_IPV6_ADDR1 0
-#define OAI_NW_DRV_DEFAULT_IPV6_ADDR2 0
-#define OAI_NW_DRV_DEFAULT_IPV6_ADDR3 0
-
-
-#define OAI_NW_DRV_MPLS_VERSION_CODE  99
-
-#define OAI_NW_DRV_NB_INSTANCES_MAX       8
-
-
-#endif
-

openair2/NETWORK_DRIVER/LITE/ioctl.c

-/*
- * 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
- */
-
-#include "local.h"
-#include "ioctl.h"
-#include "proto_extern.h"
-
-#include <asm/uaccess.h>
-#include <asm/checksum.h>
-#include <asm/uaccess.h>
-
-#define NIP6ADDR(addr) \
-        ntohs((addr)->s6_addr16[0]), \
-        ntohs((addr)->s6_addr16[1]), \
-        ntohs((addr)->s6_addr16[2]), \
-        ntohs((addr)->s6_addr16[3]), \
-        ntohs((addr)->s6_addr16[4]), \
-        ntohs((addr)->s6_addr16[5]), \
-        ntohs((addr)->s6_addr16[6]), \
-        ntohs((addr)->s6_addr16[7])
-
-uint8_t g_msgrep[OAI_NW_DRV_LIST_CLASS_MAX*sizeof(struct oai_nw_drv_msg_class_list_reply)+1];
-
-// Statistic
-//---------------------------------------------------------------------------
-void oai_nw_drv_set_msg_statistic_reply(struct oai_nw_drv_msg_statistic_reply *msgrep,
-                                        struct oai_nw_drv_priv *priv)
-{
-  //---------------------------------------------------------------------------
-  msgrep->rx_packets=priv->stats.rx_packets;
-  msgrep->tx_packets=priv->stats.tx_packets;
-  msgrep->rx_bytes=priv->stats.rx_bytes;
-  msgrep->tx_bytes=priv->stats.tx_bytes;
-  msgrep->rx_errors=priv->stats.rx_errors;
-  msgrep->tx_errors=priv->stats.tx_errors;
-  msgrep->rx_dropped=priv->stats.rx_dropped;
-  msgrep->tx_dropped=priv->stats.tx_dropped;
-}
-
-//---------------------------------------------------------------------------
-int oai_nw_drv_ioCTL_statistic_request(struct oai_nw_drv_ioctl *gifr,
-                                       struct oai_nw_drv_priv *priv)
-{
-  //---------------------------------------------------------------------------
-  struct oai_nw_drv_msg_statistic_reply msgrep;
-  printk("NAS_IOCTL_STATISTIC: stat requested\n");
-  oai_nw_drv_set_msg_statistic_reply(&msgrep,priv);
-
-  if (copy_to_user(gifr->msg, &msgrep, sizeof(msgrep))) {
-    printk("NAS_IOCTL_STATISTIC: copy_to_user failure\n");
-    return -EFAULT;
-  }
-
-  return 0;
-}
-
-
-
-///////////////////////////////////////////////////////////////////////////////
-// IMEI
-// Messages for IMEI transfer
-
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// IOCTL command
-//---------------------------------------------------------------------------
-int oai_nw_drv_CTL_ioctl(struct net_device *dev,
-                         struct ifreq *ifr,
-                         int cmd)
-{
-  //---------------------------------------------------------------------------
-  struct oai_nw_drv_ioctl *gifr;
-  struct oai_nw_drv_priv *priv=netdev_priv(dev);
-
-  int r;
-
-  //  printk("NAS_CTL_IOCTL: begin ioctl for instance %d\n",find_inst(dev));
-
-  switch(cmd) {
-  case OAI_NW_DRV_IOCTL_RRM:
-    gifr=(struct oai_nw_drv_ioctl *)ifr;
-
-    switch(gifr->type) {
-    case OAI_NW_DRV_MSG_STATISTIC_REQUEST:
-      r=oai_nw_drv_ioCTL_statistic_request(gifr,priv);
-      break;
-
-
-    default:
-      //  printk("NAS_IOCTL_RRM: unkwon request type, type=%x\n", gifr->type);
-      r=-EFAULT;
-    }
-
-    break;
-
-  default:
-    //      printk("NAS_CTL_IOCTL: Unknown ioctl command, cmd=%x\n", cmd);
-    r=-EFAULT;
-  }
-
-  //  printk("NAS_CTL_IOCTL: end\n");
-  return r;
-}
-
-//---------------------------------------------------------------------------
-void oai_nw_drv_CTL_send(struct sk_buff *skb, int inst)
-{
-  //---------------------------------------------------------------------------
-  printk("NAS_CTL_SEND - void \n");
-}

openair2/NETWORK_DRIVER/MESH/RB_TOOL/Makefile

-CC = gcc
-
-NAS_DIR = ..
-
-
-rb_tool: rb_tool.c 
-	$(CC) rb_tool.c -o rb_tool -I../ -g -ggdb
-
-all:    rb_tool
-
-clean:
-	rm -f rb_tool

openair2/NETWORK_DRIVER/UE_IP/README

-This the driver for the UE when NAS layer is running in the UE (EPC setting).
\ No newline at end of file