mirror of
https://gerrit.osmocom.org/osmo-gbproxy
synced 2024-08-21 18:36:25 +00:00
smpp_smsc: Fix socket read() error handling
Read returning -1 is an error here so make sure to print the actual reason and close the socket. Before this patch we just looped over the fd with read returning -1 every time. EINTR is handled to not cause an error and we don't need to check EAGAIN/EWOULDBLOCK since the callback is only called in case there is something to read. To avoid copy&paste issues the check is implemented as a macro and the log message moved into a separate if.
This commit is contained in:
parent
38abd7bfbe
commit
ef97254022
1 changed files with 31 additions and 16 deletions
|
@ -762,6 +762,23 @@ static int smpp_pdu_rx(struct osmo_esme *esme, struct msgb *msg __uses)
|
|||
return rc;
|
||||
}
|
||||
|
||||
/* This macro should be called after a call to read() in the read_cb of an
|
||||
* osmo_fd to properly check for errors.
|
||||
* rc is the return value of read, err_label is the label to jump to in case of
|
||||
* an error. The code there should handle closing the connection.
|
||||
* FIXME: This code should go in libosmocore utils.h so it can be used by other
|
||||
* projects as well.
|
||||
* */
|
||||
#define OSMO_FD_CHECK_READ(rc, err_label) \
|
||||
if (rc < 0) { \
|
||||
/* EINTR is a non-fatal error, just try again */ \
|
||||
if (errno == EINTR) \
|
||||
return 0; \
|
||||
goto err_label; \
|
||||
} else if (rc == 0) { \
|
||||
goto err_label; \
|
||||
}
|
||||
|
||||
/* !\brief call-back when per-ESME TCP socket has some data to be read */
|
||||
static int esme_link_read_cb(struct osmo_fd *ofd)
|
||||
{
|
||||
|
@ -777,13 +794,13 @@ static int esme_link_read_cb(struct osmo_fd *ofd)
|
|||
case READ_ST_IN_LEN:
|
||||
rdlen = sizeof(uint32_t) - esme->read_idx;
|
||||
rc = read(ofd->fd, lenptr + esme->read_idx, rdlen);
|
||||
if (rc < 0) {
|
||||
LOGP(DSMPP, LOGL_ERROR, "[%s] read returned %d\n",
|
||||
esme->system_id, rc);
|
||||
} else if (rc == 0) {
|
||||
goto dead_socket;
|
||||
} else
|
||||
esme->read_idx += rc;
|
||||
if (rc < 0)
|
||||
LOGP(DSMPP, LOGL_ERROR, "[%s] read returned %d (%s)\n",
|
||||
esme->system_id, rc, strerror(errno));
|
||||
OSMO_FD_CHECK_READ(rc, dead_socket);
|
||||
|
||||
esme->read_idx += rc;
|
||||
|
||||
if (esme->read_idx >= sizeof(uint32_t)) {
|
||||
esme->read_len = ntohl(len);
|
||||
msg = msgb_alloc(esme->read_len, "SMPP Rx");
|
||||
|
@ -800,15 +817,13 @@ static int esme_link_read_cb(struct osmo_fd *ofd)
|
|||
msg = esme->read_msg;
|
||||
rdlen = esme->read_len - esme->read_idx;
|
||||
rc = read(ofd->fd, msg->tail, OSMO_MIN(rdlen, msgb_tailroom(msg)));
|
||||
if (rc < 0) {
|
||||
LOGP(DSMPP, LOGL_ERROR, "[%s] read returned %d\n",
|
||||
esme->system_id, rc);
|
||||
} else if (rc == 0) {
|
||||
goto dead_socket;
|
||||
} else {
|
||||
esme->read_idx += rc;
|
||||
msgb_put(msg, rc);
|
||||
}
|
||||
if (rc < 0)
|
||||
LOGP(DSMPP, LOGL_ERROR, "[%s] read returned %d (%s)\n",
|
||||
esme->system_id, rc, strerror(errno));
|
||||
OSMO_FD_CHECK_READ(rc, dead_socket);
|
||||
|
||||
esme->read_idx += rc;
|
||||
msgb_put(msg, rc);
|
||||
|
||||
if (esme->read_idx >= esme->read_len) {
|
||||
rc = smpp_pdu_rx(esme, esme->read_msg);
|
||||
|
|
Loading…
Reference in a new issue