sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

suppress socket error message if EAGAIN [#568]

This commit is contained in:
Sukchan Lee 2020-09-18 21:46:49 -04:00
parent 7071adf9f9
commit 4acb333e68
7 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/core/ogs-socket.c
View File

@ -220,23 +220,14 @@ ssize_t ogs_read(ogs_socket_t fd, void *buf, size_t len)
ssize_t ogs_send(ogs_socket_t fd, const void *buf, size_t len, int flags)
{
ssize_t size;
ogs_assert(fd != INVALID_SOCKET);
size = send(fd, buf, len, flags);
if (size < 0) {
ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
"send(len:%d) failed", (int)len);
}
return size;
return send(fd, buf, len, flags);
}
ssize_t ogs_sendto(ogs_socket_t fd,
const void *buf, size_t len, int flags, const ogs_sockaddr_t *to)
{
ssize_t size;
socklen_t addrlen;
ogs_assert(fd != INVALID_SOCKET);
@ -245,13 +236,7 @@ ssize_t ogs_sendto(ogs_socket_t fd,
addrlen = ogs_sockaddr_len(to);
ogs_assert(addrlen);
size = sendto(fd, buf, len, flags, &to->sa, addrlen);
if (size < 0) {
ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
"sendto(len:%d) failed", (int)len);
}
return size;
return sendto(fd, buf, len, flags, &to->sa, addrlen);
}
ssize_t ogs_recv(ogs_socket_t fd, void *buf, size_t len, int flags)

10
lib/gtp/path.c
View File

@ -88,7 +88,10 @@ int ogs_gtp_send(ogs_gtp_node_t *gnode, ogs_pkbuf_t *pkbuf)
sent = ogs_send(sock->fd, pkbuf->data, pkbuf->len, 0);
if (sent < 0 || sent != pkbuf->len) {
ogs_error("ogs_send() failed");
if (ogs_socket_errno != OGS_EAGAIN) {
ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
"ogs_gtp_send() failed");
}
return OGS_ERROR;
}
@ -110,7 +113,10 @@ int ogs_gtp_sendto(ogs_gtp_node_t *gnode, ogs_pkbuf_t *pkbuf)
sent = ogs_sendto(sock->fd, pkbuf->data, pkbuf->len, 0, addr);
if (sent < 0 || sent != pkbuf->len) {
ogs_error("ogs_send() failed");
if (ogs_socket_errno != OGS_EAGAIN) {
ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
"ogs_gtp_sendto() failed");
}
return OGS_ERROR;
}

22
lib/pfcp/path.c
View File

@ -89,7 +89,8 @@ int ogs_pfcp_send(ogs_pfcp_node_t *node, ogs_pkbuf_t *pkbuf)
sent = ogs_send(sock->fd, pkbuf->data, pkbuf->len, 0);
if (sent < 0 || sent != pkbuf->len) {
ogs_error("ogs_send() failed");
ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
"ogs_pfcp_send() failed");
return OGS_ERROR;
}
@ -111,7 +112,8 @@ int ogs_pfcp_sendto(ogs_pfcp_node_t *node, ogs_pkbuf_t *pkbuf)
sent = ogs_sendto(sock->fd, pkbuf->data, pkbuf->len, 0, addr);
if (sent < 0 || sent != pkbuf->len) {
ogs_error("ogs_sendto() failed");
ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
"ogs_pfcp_sendto() failed");
return OGS_ERROR;
}
@ -327,8 +329,12 @@ void ogs_pfcp_send_g_pdu(ogs_pfcp_pdr_t *pdr, ogs_pkbuf_t *sendbuf)
ogs_debug("SEND G-PDU to Peer[%s] : TEID[0x%x]",
OGS_ADDR(&gnode->addr, buf), far->outer_header_creation.teid);
rv = ogs_gtp_sendto(gnode, sendbuf);
if (rv != OGS_OK)
ogs_error("ogs_gtp_sendto() failed");
if (rv != OGS_OK) {
if (ogs_socket_errno != OGS_EAGAIN) {
ogs_error("SEND G-PDU to Peer[%s] : TEID[0x%x]",
OGS_ADDR(&gnode->addr, buf), far->outer_header_creation.teid);
}
}
ogs_pkbuf_free(sendbuf);
}
@ -407,8 +413,12 @@ void ogs_pfcp_send_end_marker(ogs_pfcp_pdr_t *pdr)
ogs_debug("SEND End Marker to Peer[%s] : TEID[0x%x]",
OGS_ADDR(&gnode->addr, buf), far->outer_header_creation.teid);
rv = ogs_gtp_sendto(gnode, sendbuf);
if (rv != OGS_OK)
ogs_error("ogs_gtp_sendto() failed");
if (rv != OGS_OK) {
if (ogs_socket_errno != OGS_EAGAIN) {
ogs_error("SEND End Marker to Peer[%s] : TEID[0x%x]",
OGS_ADDR(&gnode->addr, buf), far->outer_header_creation.teid);
}
}
ogs_pkbuf_free(sendbuf);
}

5
src/sgwc/pfcp-path.c
View File

@ -95,7 +95,10 @@ static void pfcp_recv_cb(short when, ogs_socket_t fd, void *data)
rsp.type = OGS_PFCP_VERSION_NOT_SUPPORTED_RESPONSE_TYPE;
rsp.length = htobe16(4);
rsp.sqn_only = h->sqn_only;
ogs_sendto(fd, &rsp, 8, 0, &from);
if (ogs_sendto(fd, &rsp, 8, 0, &from) < 0) {
ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
"ogs_sendto() failed");
}
ogs_pkbuf_free(pkbuf);
return;

5
src/sgwu/pfcp-path.c
View File

@ -92,7 +92,10 @@ static void pfcp_recv_cb(short when, ogs_socket_t fd, void *data)
rsp.type = OGS_PFCP_VERSION_NOT_SUPPORTED_RESPONSE_TYPE;
rsp.length = htobe16(4);
rsp.sqn_only = h->sqn_only;
ogs_sendto(fd, &rsp, 8, 0, &from);
if (ogs_sendto(fd, &rsp, 8, 0, &from) < 0) {
ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
"ogs_sendto() failed");
}
ogs_pkbuf_free(pkbuf);
return;

5
src/smf/pfcp-path.c
View File

@ -94,7 +94,10 @@ static void pfcp_recv_cb(short when, ogs_socket_t fd, void *data)
rsp.type = OGS_PFCP_VERSION_NOT_SUPPORTED_RESPONSE_TYPE;
rsp.length = htobe16(4);
rsp.sqn_only = h->sqn_only;
ogs_sendto(fd, &rsp, 8, 0, &from);
if (ogs_sendto(fd, &rsp, 8, 0, &from) < 0) {
ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
"ogs_sendto() failed");
}
ogs_pkbuf_free(pkbuf);
return;

5
src/upf/pfcp-path.c
View File

@ -95,7 +95,10 @@ static void pfcp_recv_cb(short when, ogs_socket_t fd, void *data)
rsp.type = OGS_PFCP_VERSION_NOT_SUPPORTED_RESPONSE_TYPE;
rsp.length = htobe16(4);
rsp.sqn_only = h->sqn_only;
ogs_sendto(fd, &rsp, 8, 0, &from);
if (ogs_sendto(fd, &rsp, 8, 0, &from) < 0) {
ogs_log_message(OGS_LOG_ERROR, ogs_socket_errno,
"ogs_sendto() failed");
}
ogs_pkbuf_free(pkbuf);
return;