Merge remote-tracking branch 'origin/episys-merge-nsa' into integration_2021_wk51_d

openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c

@@ -56,7 +56,7 @@ 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];
+int nas_sock_fd[MAX_MOBILES_PER_ENB*2]; //Allocated for both LTE UE and NR UE.
 
 int nas_sock_mbms_fd;
 
@@ -95,11 +95,16 @@ static int tun_alloc(char *dev) {
 }
 
 
-int netlink_init_mbms_tun(char *ifprefix) {
+int netlink_init_mbms_tun(char *ifprefix, int id) {//for UE, id = 1, 2, ...,
   int ret;
   char ifname[64];
 
-    sprintf(ifname, "oaitun_%.3s1",ifprefix); // added "1": for historical reasons
+    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) {
@@ -123,14 +128,17 @@ 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));
+
   return 1;
 }
 
-int netlink_init_tun(char *ifprefix, int num_if) {
+int netlink_init_tun(char *ifprefix, int num_if, int id) {//for UE, id = 1, 2, ...,
   int ret;
   char ifname[64];
 
-  for (int i = 0; i < num_if; i++) {
+  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);
 
@@ -189,6 +197,7 @@ int netlink_init(void) {
   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 */
@@ -211,3 +220,8 @@ int netlink_init(void) {
   return(nas_sock_fd[0]);
 }
 
+void netlink_cleanup(void)
+{
+  free(nas_nlh_tx);
+  nas_nlh_tx = NULL;
+}

openair1/SIMULATION/ETH_TRANSPORT/proto.h

@@ -62,7 +62,8 @@ 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 netlink_init_mbms_tun(char *ifsuffix);
+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/NR_PHY/pbchsim.c

@@ -193,6 +193,7 @@ int main(int argc, char **argv)
 
   int frame=0;
   int frame_length_complex_samples;
+  __attribute__((unused))
   int frame_length_complex_samples_no_prefix;
   NR_DL_FRAME_PARMS *frame_parms;
 

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -1281,8 +1281,10 @@ int main(int argc, char **argv)
 
 	if (n_trials == 1  && round==0) {
 #ifdef __AVX2__
+	  __attribute__((unused))
 	  int off = ((nb_rb&1) == 1)? 4:0;
 #else
+	  __attribute__((unused))
 	  int off = 0;
 #endif
 

openair1/SIMULATION/TOOLS/taus.c

@@ -21,10 +21,12 @@
 
 #include <time.h>
 #include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
 //#include "SIMULATION/TOOLS/sim.h"
 
 
-unsigned int s0, s1, s2, b;
+static unsigned int s0, s1, s2;
 
 //----------------------------------------------
 //
@@ -34,7 +36,7 @@ unsigned int s0, s1, s2, b;
 
 unsigned int taus(void)
 {
-  b = (((s0 << 13) ^ s0) >> 19);
+  unsigned int b = (((s0 << 13) ^ s0) >> 19);
   s0 = (((s0 & 0xFFFFFFFE) << 12)^  b);
   b = (((s1 << 2) ^ s1) >> 25);
   s1 = (((s1 & 0xFFFFFFF8) << 4)^  b);
@@ -50,9 +52,20 @@ void set_taus_seed(unsigned int seed_init)
   unsigned long result = 0;
 
   if (seed_init == 0) {
-    s0 = (unsigned int)time(NULL);
-    s1 = (unsigned int)time(NULL);
-    s2 = (unsigned int)time(NULL);
+    unsigned int data[3];
+    int fd = open("/dev/urandom", O_RDONLY);
+    if (fd == -1)
+    {
+      abort();
+    }
+    if (read(fd, data, sizeof(data)) != sizeof(data))
+    {
+      abort();
+    }
+    close(fd);
+    s0 = data[0];
+    s1 = data[1];
+    s2 = data[2];
   } else {
     /* Use reentrant version of rand48 to ensure that no conflicts with other generators occur */
     srand48_r((long int)seed_init, &buffer);