Merge branch 'next' into epc to add eNB SMC integrity fix

srsenb/src/upper/pdcp.cc

@@ -93,6 +93,8 @@ void pdcp::config_security(uint16_t rnti, uint32_t lcid, uint8_t* k_rrc_enc_, ui
 {
   if (users.count(rnti)) {
     users[rnti].pdcp->config_security(lcid, k_rrc_enc_, k_rrc_int_, cipher_algo_, integ_algo_);
+    users[rnti].pdcp->enable_integrity(lcid);
+    users[rnti].pdcp->enable_encryption(lcid);
   }
 }
 

srsue/src/phy/phch_common.cc

@@ -339,6 +339,9 @@ void phch_common::reset() {
   rx_gain_offset = 0;
   sr_last_tx_tti = -1;
   cur_pusch_power = 0;
+  avg_rsrp = 0;
+  avg_rsrp_dbm = 0;
+  avg_rsrq_db = 0;
 
   pcell_meas_enabled  = false;
   pcell_report_period = 20;

srsue/src/phy/phch_recv.cc

@@ -52,6 +52,7 @@ phch_recv::phch_recv() {
   dl_freq = -1;
   ul_freq = -1;
   bzero(&cell, sizeof(srslte_cell_t));
+  bzero(&metrics, sizeof(sync_metrics_t));
   running = false;
   worker_com = NULL;
 }