From da956931fab20413f658961d6aab798336acf2d7 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 24 Dec 2009 12:49:43 +0100 Subject: if we recv() from an abis-ip socket, don't consider -EAGAIN an error --- openbsc/src/input/ipaccess.c | 3 ++- openbsc/src/ipaccess/ipaccess-proxy.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openbsc/src/input/ipaccess.c b/openbsc/src/input/ipaccess.c index 2f79a6b1b..4396269db 100644 --- a/openbsc/src/input/ipaccess.c +++ b/openbsc/src/input/ipaccess.c @@ -270,7 +270,8 @@ struct msgb *ipaccess_read_msg(struct bsc_fd *bfd, int *error) hh = (struct ipaccess_head *) msg->data; ret = recv(bfd->fd, msg->data, 3, 0); if (ret < 0) { - LOGP(DINP, LOGL_ERROR, "recv error %s\n", strerror(errno)); + if (ret != -EAGAIN) + LOGP(DINP, LOGL_ERROR, "recv error %s\n", strerror(errno)); msgb_free(msg); *error = ret; return NULL; diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c index dd9d6b1b5..61c3c5b75 100644 --- a/openbsc/src/ipaccess/ipaccess-proxy.c +++ b/openbsc/src/ipaccess/ipaccess-proxy.c @@ -321,7 +321,8 @@ static int handle_udp_read(struct bsc_fd *bfd) hh = (struct ipaccess_head *) msg->data; ret = recv(bfd->fd, msg->data, msg->data_len, 0); if (ret < 0) { - DEBUGP(DINP, "recv error %s\n", strerror(errno)); + if (ret != -EAGAIN) + DEBUGP(DINP, "recv error %s\n", strerror(errno)); msgb_free(msg); return ret; } @@ -634,7 +635,8 @@ struct msgb *ipaccess_read_msg(struct bsc_fd *bfd, int *error) hh = (struct ipaccess_head *) msg->data; ret = recv(bfd->fd, msg->data, 3, 0); if (ret < 0) { - LOGP(DINP, LOGL_ERROR, "recv error: %s\n", strerror(errno)); + if (ret != -EAGAIN) + LOGP(DINP, LOGL_ERROR, "recv error: %s\n", strerror(errno)); msgb_free(msg); *error = ret; return NULL; -- cgit v1.2.3