fixes commit before merge develop

cmake_targets/CMakeLists.txt

@@ -345,12 +345,12 @@ endif ()
 add_definitions("-DASN_DISABLE_OER_SUPPORT")
 
 #########################
-set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -ggdb3 -Wl,-rpath -Wl,${CMAKE_CURRENT_BINARY_DIR}")
+set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -ggdb2 -Wl,-rpath -Wl,${CMAKE_CURRENT_BINARY_DIR}")
 #########################
 # set a flag for changes in the source code
 # these changes are related to hardcoded path to include .h files
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -ggdb3 -Og -DMALLOC_CHECK_=3")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -ggdb3 -DMALLOC_CHECK_=3 -O2 -fno-delete-null-pointer-checks")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -ggdb2 -Og -DMALLOC_CHECK_=3")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -ggdb2 -DMALLOC_CHECK_=3 -O2 -fno-delete-null-pointer-checks")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3")
 
 set(GIT_BRANCH        "UNKNOWN")

openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c

@@ -70,7 +70,7 @@ static int tun_alloc(char *dev) {
   int fd, err;
 
   if( (fd = open("/dev/net/tun", O_RDWR)) < 0 ) {
-    printf("[TUN] failed to open /dev/net/tun\n");
+    LOG_E(PDCP, "[TUN] failed to open /dev/net/tun\n");
     return -1;
   }
 
@@ -123,31 +123,6 @@ int netlink_init_mbms_tun(char *ifprefix) {
     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));
-    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
-    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 1;
 }
 
@@ -160,51 +135,21 @@ int netlink_init_tun(char *ifprefix, int num_if) {
     nas_sock_fd[i] = tun_alloc(ifname);
 
     if (nas_sock_fd[i] == -1) {
-      printf("[NETLINK] Error opening socket %s (%d:%s)\n",ifname,errno, strerror(errno));
+      LOG_E(PDCP, "TUN: Error opening socket %s (%d:%s)\n",ifname,errno, strerror(errno));
       exit(1);
     }
 
-    printf("[NETLINK]Opened socket %s with fd nas_sock_fd[%d]=%d\n",
+    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) {
-      printf("[NETLINK] Error fcntl (%d:%s)\n",errno, strerror(errno));
+      LOG_E(PDCP, "TUN: 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[i], (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
-    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;
   } /* for */
 
   return 1;

openair2/F1AP/f1ap_cu_task.c

@@ -147,8 +147,6 @@ F1AP_CU_task(void *arg) {
 
       case F1AP_SETUP_RESP: // from rrc
         LOG_I(F1AP, "CU Task Received F1AP_SETUP_RESP\n");
-        // CU_send_f1setup_resp(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
-        //                                       &F1AP_SETUP_RESP(received_msg));
         CU_send_F1_SETUP_RESPONSE(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
                                   &F1AP_SETUP_RESP(received_msg));
         break;

openair2/GNB_APP/gnb_config.c

@@ -1953,8 +1953,8 @@ int gNB_app_handle_f1ap_setup_resp(f1ap_setup_resp_t *resp) {
 
           du_extract_and_decode_SI(i,
                                    si_ind,
-                                   resp->cells_to_activate[j].SI_container[2+si_ind],
-                                   resp->cells_to_activate[j].SI_container_length[2+si_ind]);
+                                   resp->cells_to_activate[j].SI_container[si_ind],
+                                   resp->cells_to_activate[j].SI_container_length[si_ind]);
         }
 
         // perform MAC/L1 common configuration
@@ -1988,8 +1988,8 @@ int gNB_app_handle_f1ap_gnb_cu_configuration_update(f1ap_gnb_cu_configuration_up
 
           du_extract_and_decode_SI(i,
                                    si_ind,
-                                   gnb_cu_cfg_update->cells_to_activate[j].SI_container[2+si_ind],
-                                   gnb_cu_cfg_update->cells_to_activate[j].SI_container_length[2+si_ind]);
+                                   gnb_cu_cfg_update->cells_to_activate[j].SI_container[si_ind],
+                                   gnb_cu_cfg_update->cells_to_activate[j].SI_container_length[si_ind]);
         }
 
         // perform MAC/L1 common configuration