From 4059b19b5771becc79ab8693d3282c3113a5eb04 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Mon, 13 Aug 2018 15:55:14 +0100 Subject: [PATCH] Coding style fixups in SP-GW. --- srsepc/src/spgw/spgw.cc | 131 +++++++++++++++------------------------- 1 file changed, 49 insertions(+), 82 deletions(-) diff --git a/srsepc/src/spgw/spgw.cc b/srsepc/src/spgw/spgw.cc index 20311cc16..c1697b9ab 100644 --- a/srsepc/src/spgw/spgw.cc +++ b/srsepc/src/spgw/spgw.cc @@ -160,8 +160,7 @@ spgw::init_sgi_if(spgw_args_t *args) char dev[IFNAMSIZ] = "srs_spgw_sgi"; struct ifreq ifr; - if(m_sgi_up) - { + if (m_sgi_up) { return(srslte::ERROR_ALREADY_STARTED); } @@ -169,10 +168,9 @@ spgw::init_sgi_if(spgw_args_t *args) // Construct the TUN device m_sgi_if = open("/dev/net/tun", O_RDWR); m_spgw_log->info("TUN file descriptor = %d\n", m_sgi_if); - if(m_sgi_if < 0) - { - m_spgw_log->error("Failed to open TUN device: %s\n", strerror(errno)); - return(srslte::ERROR_CANT_START); + if (m_sgi_if < 0) { + m_spgw_log->error("Failed to open TUN device: %s\n", strerror(errno)); + return(srslte::ERROR_CANT_START); } memset(&ifr, 0, sizeof(ifr)); @@ -180,28 +178,26 @@ spgw::init_sgi_if(spgw_args_t *args) strncpy(ifr.ifr_ifrn.ifrn_name, dev, IFNAMSIZ-1); ifr.ifr_ifrn.ifrn_name[IFNAMSIZ-1]='\0'; - if(ioctl(m_sgi_if, TUNSETIFF, &ifr) < 0) - { - m_spgw_log->error("Failed to set TUN device name: %s\n", strerror(errno)); - close(m_sgi_if); - return(srslte::ERROR_CANT_START); + if (ioctl(m_sgi_if, TUNSETIFF, &ifr) < 0) { + m_spgw_log->error("Failed to set TUN device name: %s\n", strerror(errno)); + close(m_sgi_if); + return(srslte::ERROR_CANT_START); } // Bring up the interface m_sgi_sock = socket(AF_INET, SOCK_DGRAM, 0); - if(ioctl(m_sgi_sock, SIOCGIFFLAGS, &ifr) < 0) - { - m_spgw_log->error("Failed to bring up socket: %s\n", strerror(errno)); - close(m_sgi_if); - return(srslte::ERROR_CANT_START); + if (ioctl(m_sgi_sock, SIOCGIFFLAGS, &ifr) < 0) { + m_spgw_log->error("Failed to bring up socket: %s\n", strerror(errno)); + close(m_sgi_if); + return(srslte::ERROR_CANT_START); } + ifr.ifr_flags |= IFF_UP | IFF_RUNNING; - if(ioctl(m_sgi_sock, SIOCSIFFLAGS, &ifr) < 0) - { - m_spgw_log->error("Failed to set socket flags: %s\n", strerror(errno)); - close(m_sgi_if); - return(srslte::ERROR_CANT_START); + if (ioctl(m_sgi_sock, SIOCSIFFLAGS, &ifr) < 0) { + m_spgw_log->error("Failed to set socket flags: %s\n", strerror(errno)); + close(m_sgi_if); + return(srslte::ERROR_CANT_START); } //Set IP of the interface @@ -238,8 +234,7 @@ spgw::init_s1u(spgw_args_t *args) { //Open S1-U socket m_s1u = socket(AF_INET,SOCK_DGRAM,0); - if (m_s1u == -1) - { + if (m_s1u == -1) { m_spgw_log->error("Failed to open socket: %s\n", strerror(errno)); return srslte::ERROR_CANT_START; } @@ -283,8 +278,7 @@ spgw::run_thread() fd_set set; //struct timeval to; int max_fd = std::max(m_s1u,sgi); - while (m_running) - { + while (m_running) { msg->reset(); FD_ZERO(&set); FD_SET(m_s1u, &set); @@ -292,26 +286,18 @@ spgw::run_thread() //m_spgw_log->info("Waiting for S1-U or SGi packets.\n"); int n = select(max_fd+1, &set, NULL, NULL, NULL); - if (n == -1) - { + if (n == -1) { m_spgw_log->error("Error from select\n"); - } - else if (n) - { - //m_spgw_log->info("Data is available now.\n"); - if (FD_ISSET(m_s1u, &set)) - { + } else if (n) { + if (FD_ISSET(m_s1u, &set)) { msg->N_bytes = recvfrom(m_s1u, msg->msg, SRSLTE_MAX_BUFFER_SIZE_BYTES, 0, &src_addr, &addrlen ); handle_s1u_pdu(msg); } - if (FD_ISSET(m_sgi_if, &set)) - { + if (FD_ISSET(m_sgi_if, &set)) { msg->N_bytes = read(sgi, msg->msg, SRSLTE_MAX_BUFFER_SIZE_BYTES); handle_sgi_pdu(msg); } - } - else - { + } else { m_spgw_log->debug("No data from select.\n"); } } @@ -330,36 +316,31 @@ spgw::handle_sgi_pdu(srslte::byte_buffer_t *msg) srslte::gtpc_f_teid_ie enb_fteid; struct iphdr *iph = (struct iphdr *) msg->msg; - if(iph->version != 4) - { + if (iph->version != 4) { m_spgw_log->warning("IPv6 not supported yet.\n"); return; } - if(iph->tot_len < 20) - { + if (iph->tot_len < 20) { m_spgw_log->warning("Invalid IP header length.\n"); return; } pthread_mutex_lock(&m_mutex); gtp_fteid_it = m_ip_to_teid.find(iph->daddr); - if(gtp_fteid_it != m_ip_to_teid.end()) - { + if (gtp_fteid_it != m_ip_to_teid.end()) { ip_found = true; enb_fteid = gtp_fteid_it->second; } pthread_mutex_unlock(&m_mutex); - if(ip_found == false) - { - //m_spgw_log->console("IP Packet is not for any UE\n"); + if (ip_found == false) { return; } + struct sockaddr_in enb_addr; enb_addr.sin_family = AF_INET; enb_addr.sin_port = htons(GTPU_RX_PORT); enb_addr.sin_addr.s_addr = enb_fteid.ipv4; - //m_spgw_log->console("UE F-TEID found, TEID 0x%x, eNB IP %s\n", enb_fteid.teid, inet_ntoa(enb_addr.sin_addr)); //Setup GTP-U header srslte::gtpu_header_t header; @@ -369,23 +350,20 @@ spgw::handle_sgi_pdu(srslte::byte_buffer_t *msg) header.teid = enb_fteid.teid; //Write header into packet - if(!srslte::gtpu_write_header(&header, msg, m_spgw_log)) - { + if (!srslte::gtpu_write_header(&header, msg, m_spgw_log)) { m_spgw_log->console("Error writing GTP-U header on PDU\n"); } //Send packet to destination int n = sendto(m_s1u,msg->msg,msg->N_bytes,0,(struct sockaddr*) &enb_addr,sizeof(enb_addr)); - if(n<0) - { + if (n<0) { m_spgw_log->error("Error sending packet to eNB\n"); return; - } - else if((unsigned int) n!=msg->N_bytes) - { + } else if((unsigned int) n!=msg->N_bytes) { m_spgw_log->error("Mis-match between packet bytes and sent bytes: Sent: %d, Packet: %d \n",n,msg->N_bytes); } + return; } @@ -396,15 +374,12 @@ spgw::handle_s1u_pdu(srslte::byte_buffer_t *msg) //m_spgw_log->console("Received PDU from S1-U. Bytes=%d\n",msg->N_bytes); srslte::gtpu_header_t header; srslte::gtpu_read_header(msg, &header, m_spgw_log); - + //m_spgw_log->console("TEID 0x%x. Bytes=%d\n", header.teid, msg->N_bytes); int n = write(m_sgi_if, msg->msg, msg->N_bytes); - if(n<0) - { + if (n<0) { m_spgw_log->error("Could not write to TUN interface.\n"); - } - else - { + } else { //m_spgw_log->console("Forwarded packet to TUN interface. Bytes= %d/%d\n", n, msg->N_bytes); } return; @@ -473,19 +448,19 @@ bool spgw::delete_gtp_ctx(uint32_t ctrl_teid) { spgw_tunnel_ctx_t *tunnel_ctx; - if(!m_teid_to_tunnel_ctx.count(ctrl_teid)){ + if (!m_teid_to_tunnel_ctx.count(ctrl_teid)) { m_spgw_log->error("Could not find GTP context to delete.\n"); return false; } tunnel_ctx = m_teid_to_tunnel_ctx[ctrl_teid]; //Remove GTP-U connections, if any. - if(m_ip_to_teid.count(tunnel_ctx->ue_ipv4)) - { + if (m_ip_to_teid.count(tunnel_ctx->ue_ipv4)) { pthread_mutex_lock(&m_mutex); m_ip_to_teid.erase(tunnel_ctx->ue_ipv4); - pthread_mutex_unlock(&m_mutex); + pthread_mutex_unlock(&m_mutex); } + //Remove Ctrl TEID from IMSI to control TEID map m_imsi_to_ctr_teid.erase(tunnel_ctx->imsi); @@ -503,8 +478,7 @@ spgw::handle_create_session_request(struct srslte::gtpc_create_session_request * int default_bearer_id = 5; //Check if IMSI has active GTP-C and/or GTP-U bool gtpc_present = m_imsi_to_ctr_teid.count(cs_req->imsi); - if(gtpc_present) - { + if (gtpc_present) { m_spgw_log->console("SPGW: GTP-C context for IMSI %015lu already exists.\n", cs_req->imsi); delete_gtp_ctx(m_imsi_to_ctr_teid[cs_req->imsi]); m_spgw_log->console("SPGW: Deleted previous context.\n"); @@ -547,9 +521,6 @@ spgw::handle_create_session_request(struct srslte::gtpc_create_session_request * return; } - - - void spgw::handle_modify_bearer_request(struct srslte::gtpc_pdu *mb_req_pdu, struct srslte::gtpc_pdu *mb_resp_pdu) { @@ -558,8 +529,7 @@ spgw::handle_modify_bearer_request(struct srslte::gtpc_pdu *mb_req_pdu, struct s //Get control tunnel info from mb_req PDU uint32_t ctrl_teid = mb_req_pdu->header.teid; std::map::iterator tunnel_it = m_teid_to_tunnel_ctx.find(ctrl_teid); - if(tunnel_it == m_teid_to_tunnel_ctx.end()) - { + if (tunnel_it == m_teid_to_tunnel_ctx.end()) { m_spgw_log->warning("Could not find TEID %d to modify\n",ctrl_teid); return; } @@ -576,7 +546,7 @@ spgw::handle_modify_bearer_request(struct srslte::gtpc_pdu *mb_req_pdu, struct s m_spgw_log->info("IMSI: %lu, UE IP, %s \n",tunnel_ctx->imsi, inet_ntoa(addr)); m_spgw_log->info("S-GW Rx Ctrl TEID 0x%x, MME Rx Ctrl TEID 0x%x\n", tunnel_ctx->up_ctrl_fteid.teid, tunnel_ctx->dw_ctrl_fteid.teid); m_spgw_log->info("S-GW Rx Ctrl IP (NA), MME Rx Ctrl IP (NA)\n"); - + struct in_addr addr2; addr2.s_addr = tunnel_ctx->up_user_fteid.ipv4; m_spgw_log->info("S-GW Rx User TEID 0x%x, S-GW Rx User IP %s\n", tunnel_ctx->up_user_fteid.teid, inet_ntoa(addr2)); @@ -604,8 +574,9 @@ spgw::handle_modify_bearer_request(struct srslte::gtpc_pdu *mb_req_pdu, struct s srslte::gtpc_modify_bearer_response *mb_resp = &mb_resp_pdu->choice.modify_bearer_response; mb_resp->cause.cause_value = srslte::GTPC_CAUSE_VALUE_REQUEST_ACCEPTED; mb_resp->eps_bearer_context_modified.ebi = tunnel_ctx->ebi; - //printf("%d %d\n",mb_resp->eps_bearer_context_modified.ebi, tunnel_ctx->ebi); mb_resp->eps_bearer_context_modified.cause.cause_value = srslte::GTPC_CAUSE_VALUE_REQUEST_ACCEPTED; + + return; } void @@ -614,8 +585,7 @@ spgw::handle_delete_session_request(struct srslte::gtpc_pdu *del_req_pdu, struct //Find tunel ctxt uint32_t ctrl_teid = del_req_pdu->header.teid; std::map::iterator tunnel_it = m_teid_to_tunnel_ctx.find(ctrl_teid); - if(tunnel_it == m_teid_to_tunnel_ctx.end()) - { + if (tunnel_it == m_teid_to_tunnel_ctx.end()) { m_spgw_log->warning("Could not find TEID %d to delete\n",ctrl_teid); return; } @@ -625,8 +595,7 @@ spgw::handle_delete_session_request(struct srslte::gtpc_pdu *del_req_pdu, struct //Delete data tunnel pthread_mutex_lock(&m_mutex); std::map::iterator data_it = m_ip_to_teid.find(tunnel_ctx->ue_ipv4); - if(data_it != m_ip_to_teid.end()) - { + if (data_it != m_ip_to_teid.end()) { m_ip_to_teid.erase(data_it); } pthread_mutex_unlock(&m_mutex); @@ -642,8 +611,7 @@ spgw::handle_release_access_bearers_request(struct srslte::gtpc_pdu *rel_req_pdu //Find tunel ctxt uint32_t ctrl_teid = rel_req_pdu->header.teid; std::map::iterator tunnel_it = m_teid_to_tunnel_ctx.find(ctrl_teid); - if(tunnel_it == m_teid_to_tunnel_ctx.end()) - { + if (tunnel_it == m_teid_to_tunnel_ctx.end()) { m_spgw_log->warning("Could not find TEID %d to release bearers from\n",ctrl_teid); return; } @@ -653,8 +621,7 @@ spgw::handle_release_access_bearers_request(struct srslte::gtpc_pdu *rel_req_pdu //Delete data tunnel pthread_mutex_lock(&m_mutex); std::map::iterator data_it = m_ip_to_teid.find(tunnel_ctx->ue_ipv4); - if(data_it != m_ip_to_teid.end()) - { + if (data_it != m_ip_to_teid.end()) { m_ip_to_teid.erase(data_it); } pthread_mutex_unlock(&m_mutex);