osmocom
/
libosmo-abis
mirror of https://gerrit.osmocom.org/libosmo-abis
14
0
Fork 0
Code Issues Releases Wiki Activity

ipa: Allow signalling fd destroyed in ipa_client_read 

Similar to what we do in other osmo_fd cb, check for read_cb returning
-EBADF and in that case don't attempt using the osmo_fd anymore, either
because the fd was already closed (no need to then signal WRITE) or
because osmo_fd struct itself has been freed.

Change-Id: I0e449a2bdf7f0411feeccd262cd731ca6fba3fc1
This commit is contained in:
Pau Espin 2018-08-28 17:32:29 +02:00
parent 3750dea968
commit 2775798edb
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osmocom/abis/ipa.h
View File

@ -71,6 +71,7 @@ struct ipa_client_conn {
const char *addr;
uint16_t port;
void (*updown_cb)(struct ipa_client_conn *link, int up);
/* Callback when ofd has something to be read. -EBADF must be returned if the osmo_fd is destroyed. */
int (*read_cb)(struct ipa_client_conn *link, struct msgb *msg);
int (*write_cb)(struct ipa_client_conn *link);
void *data;

15
src/input/ipa.c
View File

@ -47,7 +47,7 @@ void ipa_client_conn_close(struct ipa_client_conn *link)
link->pending_msg = NULL;
}
static void ipa_client_read(struct ipa_client_conn *link)
static int ipa_client_read(struct ipa_client_conn *link)
{
struct osmo_fd *ofd = link->ofd;
struct msgb *msg;
@ -58,7 +58,7 @@ static void ipa_client_read(struct ipa_client_conn *link)
ret = ipa_msg_recv_buffered(ofd->fd, &msg, &link->pending_msg);
if (ret <= 0) {
if (ret == -EAGAIN)
return;
return 0;
else if (ret == -EPIPE || ret == -ECONNRESET)
LOGIPA(link, LOGL_ERROR, "lost connection with server\n");
else if (ret == 0)
@ -66,10 +66,11 @@ static void ipa_client_read(struct ipa_client_conn *link)
ipa_client_conn_close(link);
if (link->updown_cb)
link->updown_cb(link, 0);
return;
return -EBADF;
}
if (link->read_cb)
link->read_cb(link, msg);
return link->read_cb(link, msg);
return 0;
}
static void ipa_client_write(struct ipa_client_conn *link)
@ -111,7 +112,7 @@ static int ipa_client_write_default_cb(struct ipa_client_conn *link)
static int ipa_client_fd_cb(struct osmo_fd *ofd, unsigned int what)
{
struct ipa_client_conn *link = ofd->data;
int error, ret;
int error, ret = 0;
socklen_t len = sizeof(error);
switch(link->state) {
@ -132,9 +133,9 @@ static int ipa_client_fd_cb(struct osmo_fd *ofd, unsigned int what)
case IPA_CLIENT_LINK_STATE_CONNECTED:
if (what & BSC_FD_READ) {
LOGIPA(link, LOGL_DEBUG, "connected read\n");
ipa_client_read(link);
ret = ipa_client_read(link);
}
if (what & BSC_FD_WRITE) {
if (ret != -EBADF && (what & BSC_FD_WRITE)) {
LOGIPA(link, LOGL_DEBUG, "connected write\n");
ipa_client_write(link);
}