diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2007-02-22 12:38:37 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2007-02-22 12:38:37 +0000 |
| commit | c60202dffe995aef7dae4419ca6e2895e976767e (patch) | |
| tree | 29a58fc4eab940776f2f41f3348ed58e6641dc8e /ffserver.c | |
| parent | d96633bbe4d6835c89deea41ea54846246e74d89 (diff) | |
| download | ffmpeg-c60202dffe995aef7dae4419ca6e2895e976767e.tar.gz | |
change write/read to send/recv on socket operations
Originally committed as revision 8069 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ffserver.c b/ffserver.c index 8b1e5af408..394134b373 100644 --- a/ffserver.c +++ b/ffserver.c @@ -787,7 +787,7 @@ static int handle_connection(HTTPContext *c) return 0; /* read the data */ read_loop: - len = read(c->fd, c->buffer_ptr, 1); + len = recv(c->fd, c->buffer_ptr, 1, 0); if (len < 0) { if (errno != EAGAIN && errno != EINTR) return -1; @@ -822,7 +822,7 @@ static int handle_connection(HTTPContext *c) /* no need to write if no events */ if (!(c->poll_entry->revents & POLLOUT)) return 0; - len = write(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr); + len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0); if (len < 0) { if (errno != EAGAIN && errno != EINTR) { /* error : close connection */ @@ -889,7 +889,7 @@ static int handle_connection(HTTPContext *c) /* no need to write if no events */ if (!(c->poll_entry->revents & POLLOUT)) return 0; - len = write(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr); + len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0); if (len < 0) { if (errno != EAGAIN && errno != EINTR) { /* error : close connection */ @@ -914,8 +914,8 @@ static int handle_connection(HTTPContext *c) /* no need to write if no events */ if (!(c->poll_entry->revents & POLLOUT)) return 0; - len = write(c->fd, c->packet_buffer_ptr, - c->packet_buffer_end - c->packet_buffer_ptr); + len = send(c->fd, c->packet_buffer_ptr, + c->packet_buffer_end - c->packet_buffer_ptr, 0); if (len < 0) { if (errno != EAGAIN && errno != EINTR) { /* error : close connection */ @@ -2286,8 +2286,8 @@ static int http_send_data(HTTPContext *c) c->buffer_ptr += len; /* send everything we can NOW */ - len = write(rtsp_c->fd, rtsp_c->packet_buffer_ptr, - rtsp_c->packet_buffer_end - rtsp_c->packet_buffer_ptr); + len = send(rtsp_c->fd, rtsp_c->packet_buffer_ptr, + rtsp_c->packet_buffer_end - rtsp_c->packet_buffer_ptr, 0); if (len > 0) { rtsp_c->packet_buffer_ptr += len; } @@ -2311,7 +2311,7 @@ static int http_send_data(HTTPContext *c) } } else { /* TCP data output */ - len = write(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr); + len = send(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0); if (len < 0) { if (errno != EAGAIN && errno != EINTR) { /* error : close connection */ @@ -2368,7 +2368,7 @@ static int http_receive_data(HTTPContext *c) if (c->buffer_end > c->buffer_ptr) { int len; - len = read(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr); + len = recv(c->fd, c->buffer_ptr, c->buffer_end - c->buffer_ptr, 0); if (len < 0) { if (errno != EAGAIN && errno != EINTR) { /* error : close connection */ |