diff options
author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-10-05 12:34:43 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-10-05 13:43:18 +0200 |
commit | 7c20d4ef1e27974910c79979649fcba2a95ad1f8 (patch) | |
tree | 4aa9a89bbf2066eb08a6f5c8440f6fe1be3c8753 /src/stream.c | |
parent | 57d86b7d286661da88ad490ec98a7b334ec6be01 (diff) |
stream: remove internal stream_msg_recv()
Remove stream_msg_recv(...), now we use recv(...) directly. This fixes
since we were calling msgb_put(...) twice.
Diffstat (limited to 'src/stream.c')
-rw-r--r-- | src/stream.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/stream.c b/src/stream.c index e29075e..9447a64 100644 --- a/src/stream.c +++ b/src/stream.c @@ -43,18 +43,6 @@ struct stream_client_conn { void *data; }; -static int stream_msg_recv(int fd, struct msgb *msg) -{ - int ret; - - ret = recv(fd, msg->data, msg->data_len, 0); - if (ret <= 0) - return ret; - - msgb_put(msg, ret); - return ret; -} - void stream_client_conn_close(struct stream_client_conn *link); static void stream_client_retry(struct stream_client_conn *link) @@ -84,7 +72,7 @@ static void stream_client_read(struct stream_client_conn *link) LOGP(DLINP, LOGL_ERROR, "cannot allocate room for message\n"); return; } - ret = stream_msg_recv(link->ofd.fd, msg); + ret = recv(link->ofd.fd, msg->data, msg->data_len, 0); if (ret < 0) { if (errno == EPIPE || errno == ECONNRESET) { LOGP(DLINP, LOGL_ERROR, "lost connection with server\n"); @@ -382,7 +370,7 @@ static void stream_server_conn_read(struct stream_server_conn *conn) LOGP(DLINP, LOGL_ERROR, "cannot allocate room for message\n"); return; } - ret = stream_msg_recv(conn->ofd.fd, msg); + ret = recv(conn->ofd.fd, msg->data, msg->data_len, 0); if (ret < 0) { if (errno == EPIPE || errno == ECONNRESET) { LOGP(DLINP, LOGL_ERROR, "lost connection with server\n"); |