Merge remote-tracking branch 'origin/develop' into develop-nr

Conflicts:
	ci-scripts/Jenkinsfile-gitlab
	ci-scripts/buildOnVM.sh
	ci-scripts/checkCodingFormattingRules.sh
	ci-scripts/createVM.sh
	ci-scripts/destroyAllRunningVM.sh
	ci-scripts/reportBuildLocally.sh
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	cmake_targets/tools/build_helper
	common/utils/LOG/log.h
	openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
	openair1/PHY/TOOLS/file_output.c
	openair1/PHY/TOOLS/lte_dfts.c
	openair1/PHY/TOOLS/tools_defs.h
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/COMMON/platform_constants.h
	openair2/COMMON/platform_types.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/main.c
	openair2/RRC/LTE/L2_interface.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
	openair2/UTIL/LOG/log.c
	openair3/S1AP/s1ap_common.h
	openair3/S1AP/s1ap_eNB.c
	openair3/S1AP/s1ap_eNB_context_management_procedures.c
	openair3/S1AP/s1ap_eNB_decoder.c
	openair3/S1AP/s1ap_eNB_decoder.h
	openair3/S1AP/s1ap_eNB_handlers.c
	openair3/S1AP/s1ap_eNB_nas_procedures.c
	openair3/S1AP/s1ap_eNB_overload.c
	openair3/S1AP/s1ap_eNB_trace.c
	openair3/TEST/EPC_TEST/play_scenario_decode.c
	openair3/TEST/EPC_TEST/play_scenario_s1ap.c
	openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c
	targets/COMMON/openairinterface5g_limits.h
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
	targets/RT/USER/lte-ran.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-ue.c
	targets/SIMU/USER/oaisim_functions.c

openair2/UTIL/OPT/opt.h

@@ -48,7 +48,7 @@ This header file must be included */
 #endif
 #ifndef project_include
 #define project_include
-#include "UTIL/LOG/log_if.h"
+#include "common/utils/LOG/log_if.h"
 // #include "UTIL/LOG/log_extern.h"
 //#include "PHY/defs.h"
 //#include "PHY/extern.h"

openair2/UTIL/OPT/packet-mac-lte.h

@@ -46,17 +46,6 @@
 #define DIRECTION_DOWNLINK 1
 
 /* SR: no need to declare following part: */
-#if 0
-/* rntiType */
-#define NO_RNTI  0
-#define P_RNTI   1
-#define RA_RNTI  2
-#define C_RNTI   3
-#define SI_RNTI  4
-#define SPS_RNTI 5
-#define M_RNTI   6
-#endif
-
 typedef enum mac_lte_oob_event {
   ltemac_send_preamble,
   ltemac_send_sr,
@@ -153,35 +142,6 @@ typedef struct mac_lte_info {
   guint16            oob_rnti[MAX_SRs];
 } mac_lte_info;
 
-/* SR: no need to declare following part: */
-#if 0
-typedef struct mac_lte_tap_info {
-  /* Info from context */
-  guint16  rnti;
-  guint16  ueid;
-  guint8   rntiType;
-  guint8   isPredefinedData;
-  guint8   crcStatusValid;
-  mac_lte_crc_status   crcStatus;
-  guint8   direction;
-
-  guint8   isPHYRetx;
-  guint16  ueInTTI;
-
-  nstime_t time;
-
-  /* Number of bytes (which part is used depends upon context settings) */
-  guint32  single_number_of_bytes;
-  guint32  bytes_for_lcid[11];
-  guint32  sdus_for_lcid[11];
-  guint8   number_of_rars;
-
-  /* Number of padding bytes includes padding subheaders and trailing padding */
-  guint16  padding_bytes;
-  guint16  raw_length;
-} mac_lte_tap_info;
-#endif
-
 /* Accessor function to check if a frame was considered to be ReTx */
 //int is_mac_lte_frame_retx(packet_info *pinfo, guint8 direction);
 

openair2/UTIL/OPT/probe.c

@@ -543,11 +543,11 @@ int init_opt(char *path, char *ip, char *port, radio_type_t radio_type_p)
   }
 
   if ( opt_type == OPT_WIRESHARK )
-    LOG_G(OPT,"mode Wireshark: ip %s port %d\n", in_ip, in_port);
+    LOG_E(OPT,"mode Wireshark: ip %s port %d\n", in_ip, in_port);
   else if (opt_type == OPT_PCAP)
-    LOG_G(OPT,"mode PCAB : path is %s \n",in_path);
+    LOG_E(OPT,"mode PCAB : path is %s \n",in_path);
   else
-    LOG_G(OPT,"Unsupported or unknown mode %d \n", opt_type);
+    LOG_E(OPT,"Unsupported or unknown mode %d \n", opt_type);
 
   //  mac_info = (mac_info*)malloc16(sizeof(mac_lte_info));
   // memset(mac_info, 0, sizeof(mac_lte_info)+pdu_buffer_size + 8);