Fixing coding style of some if statements.

srsepc/src/mme/s1ap.cc

@@ -101,8 +101,7 @@ s1ap::init(s1ap_args_t s1ap_args, srslte::log_filter *s1ap_log, hss_interface_s1
 
   //Init PCAP
   m_pcap_enable = s1ap_args.pcap_enable;
-  if(m_pcap_enable)
+  if(m_pcap_enable){
-  {
     m_pcap.open(s1ap_args.pcap_filename.c_str());
   }
   m_s1ap_log->info("S1AP Initialized\n");
@@ -138,10 +137,10 @@ s1ap::stop()
   s1ap_ctx_mngmt_proc::cleanup();
 
   //PCAP
-  if(m_pcap_enable)
+  if(m_pcap_enable){
-  {
     m_pcap.close();
   }
+
   return;
 }
 
@@ -213,14 +212,12 @@ bool
 s1ap::s1ap_tx_pdu(srslte::byte_buffer_t *pdu, struct sctp_sndrcvinfo *enb_sri)
 {
   ssize_t n_sent = sctp_send(m_s1mme, pdu->msg, pdu->N_bytes, enb_sri, 0);
-  if(n_sent == -1)
+  if(n_sent == -1){
-  {
     m_s1ap_log->console("Failed to send S1AP PDU.\n");
     m_s1ap_log->error("Failed to send S1AP PDU. \n");
     return false;
   }
-  if(m_pcap_enable)
+  if(m_pcap_enable){
-  {
     m_pcap.write_s1ap(pdu->msg,pdu->N_bytes);
   }
   return true;
@@ -290,11 +287,12 @@ s1ap::handle_initiating_message(LIBLTE_S1AP_INITIATINGMESSAGE_STRUCT *msg,  stru
     m_s1ap_log->error("Unhandled S1AP intiating message: %s\n", liblte_s1ap_initiatingmessage_choice_text[msg->choice_type]);
     m_s1ap_log->console("Unhandled S1APintiating message: %s\n", liblte_s1ap_initiatingmessage_choice_text[msg->choice_type]);
   }
+
   //Send Reply to eNB
-  if(reply_flag == true)
+  if(reply_flag == true){
-  {
     ret = s1ap_tx_pdu(reply_buffer, enb_sri);
   }
+
   m_pool->deallocate(reply_buffer);
   return ret;
 }

srsepc/src/mme/s1ap_ctx_mngmt_proc.cc

@@ -136,34 +136,28 @@ s1ap_ctx_mngmt_proc::send_initial_context_setup_request(ue_emm_ctx_t *emm_ctx,
   memcpy(erab_ctx_req->gTP_TEID.buffer, &sgw_s1u_teid, sizeof(uint32_t));
 
   //Set UE security capabilities and k_enb
-  bzero(in_ctxt_req->UESecurityCapabilities.encryptionAlgorithms.buffer,sizeof(uint8_t)*16); 
+  bzero(in_ctxt_req->UESecurityCapabilities.encryptionAlgorithms.buffer,sizeof(uint8_t)*16);
-  bzero(in_ctxt_req->UESecurityCapabilities.integrityProtectionAlgorithms.buffer,sizeof(uint8_t)*16); 
+  bzero(in_ctxt_req->UESecurityCapabilities.integrityProtectionAlgorithms.buffer,sizeof(uint8_t)*16);
-  for(int i = 0; i<3; i++)
+
-  {
+  for (int i = 0; i<3; i++) {
-    if(emm_ctx->security_ctxt.ue_network_cap.eea[i+1] == true)
+    if(emm_ctx->security_ctxt.ue_network_cap.eea[i+1] == true){
-    {
       in_ctxt_req->UESecurityCapabilities.encryptionAlgorithms.buffer[i] = 1;          //EEA supported
-    }
+    } else {
-    else
-    {
       in_ctxt_req->UESecurityCapabilities.encryptionAlgorithms.buffer[i] = 0;          //EEA not supported
     }
-    if(emm_ctx->security_ctxt.ue_network_cap.eia[i+1] == true)
+    if(emm_ctx->security_ctxt.ue_network_cap.eia[i+1] == true){
-    {
       in_ctxt_req->UESecurityCapabilities.integrityProtectionAlgorithms.buffer[i] = 1;          //EEA supported
-    }
+    } else {
-    else
-    {
       in_ctxt_req->UESecurityCapabilities.integrityProtectionAlgorithms.buffer[i] = 0;          //EEA not supported
     }
   }
+
   //Get K eNB
   liblte_unpack(emm_ctx->security_ctxt.k_enb, 32, in_ctxt_req->SecurityKey.buffer);
   m_s1ap_log->info_hex(emm_ctx->security_ctxt.k_enb, 32, "Initial Context Setup Request -- Key eNB (k_enb)\n");
 
   srslte::byte_buffer_t *nas_buffer = m_pool->allocate();
-  if(emm_ctx->state == EMM_STATE_DEREGISTERED)
+  if (emm_ctx->state == EMM_STATE_DEREGISTERED) {
-  {
     //Attach procedure initiated from an attach request
     m_s1ap_log->console("Adding attach accept to Initial Context Setup Request\n");
     m_s1ap_log->info("Adding attach accept to Initial Context Setup Request\n");
@@ -172,14 +166,12 @@ s1ap_ctx_mngmt_proc::send_initial_context_setup_request(ue_emm_ctx_t *emm_ctx,
 
 
   LIBLTE_ERROR_ENUM err = liblte_s1ap_pack_s1ap_pdu(&pdu, (LIBLTE_BYTE_MSG_STRUCT*)reply_buffer);
-  if(err != LIBLTE_SUCCESS)
+  if (err != LIBLTE_SUCCESS) {
-  {
     m_s1ap_log->error("Could not pack Initial Context Setup Request Message\n");
     return false;
   }
 
-  if(!m_s1ap->s1ap_tx_pdu(reply_buffer,&ecm_ctx->enb_sri))
+  if (!m_s1ap->s1ap_tx_pdu(reply_buffer,&ecm_ctx->enb_sri)) {
-  {
     m_s1ap_log->error("Error sending Initial Context Setup Request.\n");
     return false;
   }
@@ -355,17 +347,6 @@ s1ap_ctx_mngmt_proc::send_ue_context_release_command(ue_ecm_ctx_t *ecm_ctx, srsl
 bool
 s1ap_ctx_mngmt_proc::handle_ue_context_release_complete(LIBLTE_S1AP_MESSAGE_UECONTEXTRELEASECOMPLETE_STRUCT *rel_comp)
 {
-  /*
-    typedef struct{
-    bool                                                         ext;
-    LIBLTE_S1AP_MME_UE_S1AP_ID_STRUCT                            MME_UE_S1AP_ID;
-    LIBLTE_S1AP_ENB_UE_S1AP_ID_STRUCT                            eNB_UE_S1AP_ID;
-    LIBLTE_S1AP_CRITICALITYDIAGNOSTICS_STRUCT                    CriticalityDiagnostics;
-    bool                                                         CriticalityDiagnostics_present;
-    LIBLTE_S1AP_USERLOCATIONINFORMATION_STRUCT                   UserLocationInformation;
-    bool                                                         UserLocationInformation_present;
-    }LIBLTE_S1AP_MESSAGE_UECONTEXTRELEASECOMPLETE_STRUCT;
-   */
 
   uint32_t mme_ue_s1ap_id = rel_comp->MME_UE_S1AP_ID.MME_UE_S1AP_ID;
   m_s1ap_log->info("Received UE Context Release Complete. MME-UE S1AP Id: %d\n", mme_ue_s1ap_id);
@@ -381,23 +362,19 @@ s1ap_ctx_mngmt_proc::handle_ue_context_release_complete(LIBLTE_S1AP_MESSAGE_UECO
   ue_ecm_ctx_t *ecm_ctx = &ue_ctx->ecm_ctx; 
 
   //Delete user plane context at the SPGW (but keep GTP-C connection).
-  if (ecm_ctx->state == ECM_STATE_CONNECTED)
+  if (ecm_ctx->state == ECM_STATE_CONNECTED) {
-  {
     //There are active E-RABs, send release access mearers request
     m_s1ap_log->console("There are active E-RABs, send release access mearers request");
     m_s1ap_log->info("There are active E-RABs, send release access mearers request");
     m_mme_gtpc->send_release_access_bearers_request(ecm_ctx->imsi);
     //The handle_releease_access_bearers_response function will make sure to mark E-RABS DEACTIVATED
     //It will release the UEs downstream S1-u and keep the upstream S1-U connection active.
-  }
+  } else {
-  else
-  {
     //No ECM Context to release
     m_s1ap_log->info("UE is not ECM connected. No need to release S1-U. MME UE S1AP Id %d\n", mme_ue_s1ap_id);
     m_s1ap_log->console("UE is not ECM connected. No need to release S1-U. MME UE S1AP Id %d\n", mme_ue_s1ap_id);
-    //Make sure E-RABS are merked as DEACTIVATED.
+    //Make sure E-RABS are marked as DEACTIVATED.
-    for(int i=0;i<MAX_ERABS_PER_UE;i++)
+    for (int i=0;i<MAX_ERABS_PER_UE;i++) {
-    {
       ecm_ctx->erabs_ctx[i].state = ERAB_DEACTIVATED;
     }
   }