PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

network_utils: lower verbosity of when socket connection fails 

the network helper can log this event but it should be up to
the caller to decide whether this is an error or not.
This commit is contained in:
Andre Puschmann 2020-09-15 13:17:17 +02:00
parent 7e6487b6fa
commit 9dd02af15c
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/src/common/network_utils.cc
View File

@ -32,6 +32,8 @@
namespace srslte { namespace srslte {
const char* LOGSERVICE = "COMN";
namespace net_utils { namespace net_utils {
//! Set IP:port for ipv4 //! Set IP:port for ipv4
@ -111,7 +113,7 @@ int open_socket(net_utils::addr_family ip_type, net_utils::socket_type socket_ty
{ {
int fd = socket((int)ip_type, (int)socket_type, (int)protocol); int fd = socket((int)ip_type, (int)socket_type, (int)protocol);
if (fd == -1) { if (fd == -1) {
srslte::logmap::get("COMMON")->error("Failed to open %s socket.\n", net_utils::protocol_to_string(protocol)); srslte::logmap::get(LOGSERVICE)->error("Failed to open %s socket.\n", net_utils::protocol_to_string(protocol));
perror("Could not create socket\n"); perror("Could not create socket\n");
return -1; return -1;
} }
@ -123,7 +125,7 @@ int open_socket(net_utils::addr_family ip_type, net_utils::socket_type socket_ty
evnts.sctp_data_io_event = 1; evnts.sctp_data_io_event = 1;
evnts.sctp_shutdown_event = 1; evnts.sctp_shutdown_event = 1;
if (setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &evnts, sizeof(evnts)) != 0) { if (setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &evnts, sizeof(evnts)) != 0) {
srslte::logmap::get("COMMON")->error("Failed to subscribe to SCTP_SHUTDOWN event: %s\n", strerror(errno)); srslte::logmap::get(LOGSERVICE)->error("Failed to subscribe to SCTP_SHUTDOWN event: %s\n", strerror(errno));
perror("setsockopt"); perror("setsockopt");
} }
} }
@ -134,13 +136,13 @@ int open_socket(net_utils::addr_family ip_type, net_utils::socket_type socket_ty
bool bind_addr(int fd, const sockaddr_in& addr_in) bool bind_addr(int fd, const sockaddr_in& addr_in)
{ {
if (fd < 0) { if (fd < 0) {
srslte::logmap::get("COMMON")->error("Trying to bind to a closed socket\n"); srslte::logmap::get(LOGSERVICE)->error("Trying to bind to a closed socket\n");
return false; return false;
} }
if (bind(fd, (struct sockaddr*)&addr_in, sizeof(addr_in)) != 0) { if (bind(fd, (struct sockaddr*)&addr_in, sizeof(addr_in)) != 0) {
srslte::logmap::get("COMMON")->error( srslte::logmap::get(LOGSERVICE)
"Failed to bind on address %s: %s errno %d\n", get_ip(addr_in).c_str(), strerror(errno), errno); ->error("Failed to bind on address %s: %s errno %d\n", get_ip(addr_in).c_str(), strerror(errno), errno);
perror("bind()"); perror("bind()");
return false; return false;
} }
@ -151,7 +153,7 @@ bool bind_addr(int fd, const char* bind_addr_str, int port, sockaddr_in* addr_re
{ {
sockaddr_in addr_tmp{}; sockaddr_in addr_tmp{};
if (not net_utils::set_sockaddr(&addr_tmp, bind_addr_str, port)) { if (not net_utils::set_sockaddr(&addr_tmp, bind_addr_str, port)) {
srslte::logmap::get("COMMON")->error("Failed to convert IP address (%s) to sockaddr_in struct\n", bind_addr_str); srslte::logmap::get(LOGSERVICE)->error("Failed to convert IP address (%s) to sockaddr_in struct\n", bind_addr_str);
return false; return false;
} }
bind_addr(fd, addr_tmp); bind_addr(fd, addr_tmp);
@ -164,19 +166,20 @@ bool bind_addr(int fd, const char* bind_addr_str, int port, sockaddr_in* addr_re
bool connect_to(int fd, const char* dest_addr_str, int dest_port, sockaddr_in* dest_sockaddr) bool connect_to(int fd, const char* dest_addr_str, int dest_port, sockaddr_in* dest_sockaddr)
{ {
if (fd < 0) { if (fd < 0) {
srslte::logmap::get("COMMON")->error("tried to connect to remote address with an invalid socket.\n"); srslte::logmap::get(LOGSERVICE)->error("tried to connect to remote address with an invalid socket.\n");
return false; return false;
} }
sockaddr_in sockaddr_tmp{}; sockaddr_in sockaddr_tmp{};
if (not net_utils::set_sockaddr(&sockaddr_tmp, dest_addr_str, dest_port)) { if (not net_utils::set_sockaddr(&sockaddr_tmp, dest_addr_str, dest_port)) {
srslte::logmap::get("COMMON")->error("Error converting IP address (%s) to sockaddr_in structure\n", dest_addr_str); srslte::logmap::get(LOGSERVICE)
->error("Error converting IP address (%s) to sockaddr_in structure\n", dest_addr_str);
return false; return false;
} }
if (dest_sockaddr != nullptr) { if (dest_sockaddr != nullptr) {
*dest_sockaddr = sockaddr_tmp; *dest_sockaddr = sockaddr_tmp;
} }
if (connect(fd, (const struct sockaddr*)&sockaddr_tmp, sizeof(sockaddr_tmp)) == -1) { if (connect(fd, (const struct sockaddr*)&sockaddr_tmp, sizeof(sockaddr_tmp)) == -1) {
srslte::logmap::get("COMMON")->error("Failed to establish socket connection to %s\n", dest_addr_str); srslte::logmap::get(LOGSERVICE)->info("Failed to establish socket connection to %s\n", dest_addr_str);
perror("connect()"); perror("connect()");
return false; return false;
} }
@ -241,7 +244,7 @@ bool socket_handler_t::open_socket(net_utils::addr_family ip_type,
net_utils::protocol_type protocol) net_utils::protocol_type protocol)
{ {
if (sockfd >= 0) { if (sockfd >= 0) {
srslte::logmap::get("COMMON")->error("Socket is already open.\n"); srslte::logmap::get(LOGSERVICE)->error("Socket is already open.\n");
return false; return false;
} }
sockfd = net_utils::open_socket(ip_type, socket_type, protocol); sockfd = net_utils::open_socket(ip_type, socket_type, protocol);
@ -278,7 +281,7 @@ bool sctp_init_server(socket_handler_t* socket, net_utils::socket_type socktype,
} }
// Listen for connections // Listen for connections
if (listen(socket->fd(), SOMAXCONN) != 0) { if (listen(socket->fd(), SOMAXCONN) != 0) {
srslte::logmap::get("COMMON")->error("Failed to listen to incoming SCTP connections\n"); srslte::logmap::get(LOGSERVICE)->error("Failed to listen to incoming SCTP connections\n");
return false; return false;
} }
return true; return true;
@ -299,7 +302,7 @@ bool tcp_make_server(socket_handler_t* socket, const char* bind_addr_str, int po
} }
// Listen for connections // Listen for connections
if (listen(socket->fd(), nof_connections) != 0) { if (listen(socket->fd(), nof_connections) != 0) {
srslte::logmap::get("COMMON")->error("Failed to listen to incoming TCP connections\n"); srslte::logmap::get(LOGSERVICE)->error("Failed to listen to incoming TCP connections\n");
return false; return false;
} }
return true; return true;
@ -310,7 +313,7 @@ int tcp_accept(socket_handler_t* socket, sockaddr_in* destaddr)
socklen_t clilen = sizeof(destaddr); socklen_t clilen = sizeof(destaddr);
int connfd = accept(socket->fd(), (struct sockaddr*)&destaddr, &clilen); int connfd = accept(socket->fd(), (struct sockaddr*)&destaddr, &clilen);
if (connfd < 0) { if (connfd < 0) {
srslte::logmap::get("COMMON")->error("Failed to accept connection\n"); srslte::logmap::get(LOGSERVICE)->error("Failed to accept connection\n");
perror("accept"); perror("accept");
return -1; return -1;
} }
@ -321,12 +324,12 @@ int tcp_read(int remotefd, void* buf, size_t nbytes)
{ {
int n = ::read(remotefd, buf, nbytes); int n = ::read(remotefd, buf, nbytes);
if (n == 0) { if (n == 0) {
srslte::logmap::get("COMMON")->info("TCP connection closed\n"); srslte::logmap::get(LOGSERVICE)->info("TCP connection closed\n");
close(remotefd); close(remotefd);
return 0; return 0;
} }
if (n == -1) { if (n == -1) {
srslte::logmap::get("COMMON")->error("Failed to read from TCP socket."); srslte::logmap::get(LOGSERVICE)->error("Failed to read from TCP socket.");
perror("TCP read"); perror("TCP read");
} }
return n; return n;
@ -340,7 +343,7 @@ int tcp_send(int remotefd, const void* buf, size_t nbytes)
while (nbytes_remaining > 0) { while (nbytes_remaining > 0) {
ssize_t i = ::send(remotefd, ptr, nbytes_remaining, 0); ssize_t i = ::send(remotefd, ptr, nbytes_remaining, 0);
if (i < 1) { if (i < 1) {
srslte::logmap::get("COMMON")->error("Failed to send data to TCP socket\n"); srslte::logmap::get(LOGSERVICE)->error("Failed to send data to TCP socket\n");
perror("Error calling send()\n"); perror("Error calling send()\n");
return i; return i;
} }
@ -612,7 +615,7 @@ void rx_multisocket_handler::run_thread()
} }
bool socket_valid = callback->operator()(fd); bool socket_valid = callback->operator()(fd);
if (not socket_valid) { if (not socket_valid) {
rxSockWarn("The socket fd=%d has been closed by peer\n", fd); rxSockInfo("The socket fd=%d has been closed by peer\n", fd);
remove_socket_unprotected(fd, &total_fd_set, &max_fd); remove_socket_unprotected(fd, &total_fd_set, &max_fd);
} }
} }