diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-02-23 19:16:30 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-02-23 19:16:30 +0100 |
| commit | e2d1c87d6cfd0557861673513c58f6796f8cf709 (patch) | |
| tree | b91b2e4b58cebe458d4cd8c40356a63f188972f4 | |
| parent | 72cd95b3527ee45639f0445817781afc3e732f45 (diff) | |
datagram: minor cleanup
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/datagram.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/datagram.c b/src/datagram.c index 20cb1f8..caac1c8 100644 --- a/src/datagram.c +++ b/src/datagram.c @@ -71,7 +71,7 @@ static int osmo_dgram_client_fd_cb(struct osmo_fd *ofd, unsigned int what) struct osmo_dgram_client_conn *conn = ofd->data; if (what & BSC_FD_WRITE) { - LOGP(DLINP, LOGL_DEBUG, "connected write\n"); + LOGP(DLINP, LOGL_DEBUG, "write\n"); osmo_dgram_client_write(conn); } return 0; @@ -138,10 +138,9 @@ int osmo_dgram_client_conn_open(struct osmo_dgram_client_conn *conn) ret = osmo_sock_init(AF_INET, SOCK_DGRAM, IPPROTO_UDP, conn->addr, conn->port, OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_NONBLOCK); - if (ret < 0) { - if (errno != EINPROGRESS) - return ret; - } + if (ret < 0) + return ret; + conn->ofd.fd = ret; if (osmo_fd_register(&conn->ofd) < 0) { close(ret); @@ -199,7 +198,7 @@ static int osmo_dgram_server_conn_cb(struct osmo_fd *ofd, unsigned int what) { struct osmo_dgram_server_conn *conn = ofd->data; - LOGP(DLINP, LOGL_DEBUG, "connected read/write\n"); + LOGP(DLINP, LOGL_DEBUG, "read\n"); if (what & BSC_FD_READ) osmo_dgram_server_conn_read(conn); |