annotate tcp.c @ 6479:3e7384f85f1d libavformat

tcp: Check both wfds and efds when waiting for the result from connect On windows, a connection failure doesn't trigger wfds as it does on unix. This fixes issue 2237, based on code by yeyingxian.
author mstorsjo
date Tue, 21 Sep 2010 20:17:34 +0000
parents a5b3f5d68db6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2 * TCP protocol
4251
77e0c7511d41 cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 4206
diff changeset
3 * Copyright (c) 2002 Fabrice Bellard
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 923
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 923
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 923
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 923
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 923
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 923
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 885
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22 #include <unistd.h>
5837
d605f589f0be move ff_url_split() and ff_url_join() declarations to internal.h
aurel
parents: 5775
diff changeset
23 #include "internal.h"
1754
1f7a6dc01100 move networking #includes into separate file
mru
parents: 1689
diff changeset
24 #include "network.h"
2773
13b65f62e3a6 Include os_support.h only when needed
lucabe
parents: 2351
diff changeset
25 #include "os_support.h"
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 3941
diff changeset
26 #if HAVE_SYS_SELECT_H
3937
c0667b2aa3ab include sys/select.h to get select, according to posix 2001,
bcoudurier
parents: 3765
diff changeset
27 #include <sys/select.h>
3941
53c5b89b8dff only include sys/select.h if present, fix mingw compilation
bcoudurier
parents: 3937
diff changeset
28 #endif
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
29 #include <sys/time.h>
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
30
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31 typedef struct TCPContext {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
32 int fd;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 } TCPContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
35 /* return non zero if error */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
36 static int tcp_open(URLContext *h, const char *uri, int flags)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
37 {
5518
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
38 struct addrinfo hints, *ai, *cur_ai;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 int port, fd = -1;
683
095009fc2f35 kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 511
diff changeset
40 TCPContext *s = NULL;
6479
3e7384f85f1d tcp: Check both wfds and efds when waiting for the result from connect
mstorsjo
parents: 6378
diff changeset
41 fd_set wfds, efds;
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
42 int fd_max, ret;
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
43 struct timeval tv;
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
44 socklen_t optlen;
3765
d55fb12134d1 Remove check for @ in tcp.c which removes the authorization data from the
rbultje
parents: 3756
diff changeset
45 char hostname[1024],proto[1024],path[1024];
5518
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
46 char portstr[10];
511
056991ab9f10 HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents: 482
diff changeset
47
6182
4fc5e0e4e1cd Make ff_url_split() public
mru
parents: 6068
diff changeset
48 av_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
3756
d1f44b97b743 Cosmetics after previous patches.
rbultje
parents: 3755
diff changeset
49 &port, path, sizeof(path), uri);
d1f44b97b743 Cosmetics after previous patches.
rbultje
parents: 3755
diff changeset
50 if (strcmp(proto,"tcp") || port <= 0 || port >= 65536)
3755
b9c1bcc6c1ca On failure, return directly because the fail: case does nothing. This also
rbultje
parents: 3754
diff changeset
51 return AVERROR(EINVAL);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 753
diff changeset
52
5518
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
53 memset(&hints, 0, sizeof(hints));
5595
0980c09b05c1 Fix BSD compile (PF_UNSPEC is not a standard define, AF_UNSPEC is).
rbultje
parents: 5518
diff changeset
54 hints.ai_family = AF_UNSPEC;
5518
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
55 hints.ai_socktype = SOCK_STREAM;
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
56 snprintf(portstr, sizeof(portstr), "%d", port);
6378
a5b3f5d68db6 Print error messages in case of connection failure or name resolution failure
rbultje
parents: 6182
diff changeset
57 ret = getaddrinfo(hostname, portstr, &hints, &ai);
a5b3f5d68db6 Print error messages in case of connection failure or name resolution failure
rbultje
parents: 6182
diff changeset
58 if (ret) {
a5b3f5d68db6 Print error messages in case of connection failure or name resolution failure
rbultje
parents: 6182
diff changeset
59 av_log(NULL, AV_LOG_ERROR,
a5b3f5d68db6 Print error messages in case of connection failure or name resolution failure
rbultje
parents: 6182
diff changeset
60 "Failed to resolve hostname %s: %s\n",
a5b3f5d68db6 Print error messages in case of connection failure or name resolution failure
rbultje
parents: 6182
diff changeset
61 hostname, gai_strerror(ret));
3755
b9c1bcc6c1ca On failure, return directly because the fail: case does nothing. This also
rbultje
parents: 3754
diff changeset
62 return AVERROR(EIO);
6378
a5b3f5d68db6 Print error messages in case of connection failure or name resolution failure
rbultje
parents: 6182
diff changeset
63 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64
5518
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
65 cur_ai = ai;
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
66
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
67 restart:
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
68 fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69 if (fd < 0)
5518
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
70 goto fail;
2057
857fbfeb2fa0 implement ff_socket_nonblock and use it in networking code
alex
parents: 2056
diff changeset
71 ff_socket_nonblock(fd, 1);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 753
diff changeset
72
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
73 redo:
5518
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
74 ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
75 if (ret < 0) {
2056
eeea52739ff3 use ff_neterrno() and FF_NETERROR() for networking error handling
alex
parents: 2050
diff changeset
76 if (ff_neterrno() == FF_NETERROR(EINTR))
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
77 goto redo;
2321
96bab3153939 MinGW returns EAGAIN instead of EINPROGRESS
ramiro
parents: 2274
diff changeset
78 if (ff_neterrno() != FF_NETERROR(EINPROGRESS) &&
96bab3153939 MinGW returns EAGAIN instead of EINPROGRESS
ramiro
parents: 2274
diff changeset
79 ff_neterrno() != FF_NETERROR(EAGAIN))
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
80 goto fail;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
81
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
82 /* wait until we are connected or until abort */
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
83 for(;;) {
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
84 if (url_interrupt_cb()) {
1787
eb16c64144ee This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents: 1754
diff changeset
85 ret = AVERROR(EINTR);
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
86 goto fail1;
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
87 }
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
88 fd_max = fd;
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
89 FD_ZERO(&wfds);
6479
3e7384f85f1d tcp: Check both wfds and efds when waiting for the result from connect
mstorsjo
parents: 6378
diff changeset
90 FD_ZERO(&efds);
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
91 FD_SET(fd, &wfds);
6479
3e7384f85f1d tcp: Check both wfds and efds when waiting for the result from connect
mstorsjo
parents: 6378
diff changeset
92 FD_SET(fd, &efds);
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
93 tv.tv_sec = 0;
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
94 tv.tv_usec = 100 * 1000;
6479
3e7384f85f1d tcp: Check both wfds and efds when waiting for the result from connect
mstorsjo
parents: 6378
diff changeset
95 ret = select(fd_max + 1, NULL, &wfds, &efds, &tv);
3e7384f85f1d tcp: Check both wfds and efds when waiting for the result from connect
mstorsjo
parents: 6378
diff changeset
96 if (ret > 0 && (FD_ISSET(fd, &wfds) || FD_ISSET(fd, &efds)))
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
97 break;
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
98 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 753
diff changeset
99
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
100 /* test error */
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
101 optlen = sizeof(ret);
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
102 getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen);
6378
a5b3f5d68db6 Print error messages in case of connection failure or name resolution failure
rbultje
parents: 6182
diff changeset
103 if (ret != 0) {
a5b3f5d68db6 Print error messages in case of connection failure or name resolution failure
rbultje
parents: 6182
diff changeset
104 av_log(NULL, AV_LOG_ERROR,
a5b3f5d68db6 Print error messages in case of connection failure or name resolution failure
rbultje
parents: 6182
diff changeset
105 "TCP connection to %s:%d failed: %s\n",
a5b3f5d68db6 Print error messages in case of connection failure or name resolution failure
rbultje
parents: 6182
diff changeset
106 hostname, port, strerror(ret));
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
107 goto fail;
6378
a5b3f5d68db6 Print error messages in case of connection failure or name resolution failure
rbultje
parents: 6182
diff changeset
108 }
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
109 }
3754
8d267b43eaba Move malloc() down until after all initializations, so that the resource is
rbultje
parents: 3753
diff changeset
110 s = av_malloc(sizeof(TCPContext));
5518
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
111 if (!s) {
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
112 freeaddrinfo(ai);
3754
8d267b43eaba Move malloc() down until after all initializations, so that the resource is
rbultje
parents: 3753
diff changeset
113 return AVERROR(ENOMEM);
5518
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
114 }
3754
8d267b43eaba Move malloc() down until after all initializations, so that the resource is
rbultje
parents: 3753
diff changeset
115 h->priv_data = s;
8d267b43eaba Move malloc() down until after all initializations, so that the resource is
rbultje
parents: 3753
diff changeset
116 h->is_streamed = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117 s->fd = fd;
5518
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
118 freeaddrinfo(ai);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121 fail:
5518
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
122 if (cur_ai->ai_next) {
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
123 /* Retry with the next sockaddr */
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
124 cur_ai = cur_ai->ai_next;
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
125 if (fd >= 0)
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
126 closesocket(fd);
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
127 goto restart;
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
128 }
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2057
diff changeset
129 ret = AVERROR(EIO);
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
130 fail1:
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
131 if (fd >= 0)
1670
92afee454599 The long awaited BeOS cleanup, phase 1
mmu_man
parents: 1358
diff changeset
132 closesocket(fd);
5518
0dc71c7f6653 Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents: 5102
diff changeset
133 freeaddrinfo(ai);
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
134 return ret;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 0
diff changeset
137 static int tcp_read(URLContext *h, uint8_t *buf, int size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
138 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 TCPContext *s = h->priv_data;
388
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
140 int len, fd_max, ret;
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
141 fd_set rfds;
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
142 struct timeval tv;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143
385
2f56d366a787 no read loop tcp/http and http CRLF fix by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)
michael
parents: 261
diff changeset
144 for (;;) {
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
145 if (url_interrupt_cb())
1787
eb16c64144ee This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents: 1754
diff changeset
146 return AVERROR(EINTR);
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
147 fd_max = s->fd;
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
148 FD_ZERO(&rfds);
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
149 FD_SET(s->fd, &rfds);
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
150 tv.tv_sec = 0;
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
151 tv.tv_usec = 100 * 1000;
388
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
152 ret = select(fd_max + 1, &rfds, NULL, NULL, &tv);
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
153 if (ret > 0 && FD_ISSET(s->fd, &rfds)) {
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
154 len = recv(s->fd, buf, size, 0);
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
155 if (len < 0) {
2056
eeea52739ff3 use ff_neterrno() and FF_NETERROR() for networking error handling
alex
parents: 2050
diff changeset
156 if (ff_neterrno() != FF_NETERROR(EINTR) &&
eeea52739ff3 use ff_neterrno() and FF_NETERROR() for networking error handling
alex
parents: 2050
diff changeset
157 ff_neterrno() != FF_NETERROR(EAGAIN))
5102
81c37b782fba Use ff_neterrno instead of errno in tcp.c.
diego
parents: 4640
diff changeset
158 return AVERROR(ff_neterrno());
388
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
159 } else return len;
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
160 } else if (ret < 0) {
5896
395592984ef0 Don't report EINTR from select as an error, retry select instead
mstorsjo
parents: 5837
diff changeset
161 if (ff_neterrno() == FF_NETERROR(EINTR))
395592984ef0 Don't report EINTR from select as an error, retry select instead
mstorsjo
parents: 5837
diff changeset
162 continue;
388
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
163 return -1;
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
164 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
165 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
166 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
167
6068
7fdda2416684 Declare the url_write buffer parameter as const
mstorsjo
parents: 5896
diff changeset
168 static int tcp_write(URLContext *h, const uint8_t *buf, int size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
169 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
170 TCPContext *s = h->priv_data;
388
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
171 int ret, size1, fd_max, len;
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
172 fd_set wfds;
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
173 struct timeval tv;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
174
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
175 size1 = size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
176 while (size > 0) {
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
177 if (url_interrupt_cb())
1787
eb16c64144ee This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents: 1754
diff changeset
178 return AVERROR(EINTR);
180
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
179 fd_max = s->fd;
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
180 FD_ZERO(&wfds);
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
181 FD_SET(s->fd, &wfds);
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
182 tv.tv_sec = 0;
9e673f620f4d support aborting in TCP
bellard
parents: 65
diff changeset
183 tv.tv_usec = 100 * 1000;
388
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
184 ret = select(fd_max + 1, NULL, &wfds, NULL, &tv);
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
185 if (ret > 0 && FD_ISSET(s->fd, &wfds)) {
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
186 len = send(s->fd, buf, size, 0);
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
187 if (len < 0) {
2056
eeea52739ff3 use ff_neterrno() and FF_NETERROR() for networking error handling
alex
parents: 2050
diff changeset
188 if (ff_neterrno() != FF_NETERROR(EINTR) &&
eeea52739ff3 use ff_neterrno() and FF_NETERROR() for networking error handling
alex
parents: 2050
diff changeset
189 ff_neterrno() != FF_NETERROR(EAGAIN))
5102
81c37b782fba Use ff_neterrno instead of errno in tcp.c.
diego
parents: 4640
diff changeset
190 return AVERROR(ff_neterrno());
388
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
191 continue;
261
5f27f90ed496 Fix a very nasty problem with extra bytes appearing in TCP data streams.
philipjsg
parents: 229
diff changeset
192 }
388
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
193 size -= len;
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
194 buf += len;
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
195 } else if (ret < 0) {
5896
395592984ef0 Don't report EINTR from select as an error, retry select instead
mstorsjo
parents: 5837
diff changeset
196 if (ff_neterrno() == FF_NETERROR(EINTR))
395592984ef0 Don't report EINTR from select as an error, retry select instead
mstorsjo
parents: 5837
diff changeset
197 continue;
388
9af30d452a0a tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents: 385
diff changeset
198 return -1;
261
5f27f90ed496 Fix a very nasty problem with extra bytes appearing in TCP data streams.
philipjsg
parents: 229
diff changeset
199 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
200 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
201 return size1 - size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
202 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
203
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
204 static int tcp_close(URLContext *h)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
205 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
206 TCPContext *s = h->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
207 closesocket(s->fd);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
208 av_free(s);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
209 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
210 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
211
4640
b34d9614b887 Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents: 4251
diff changeset
212 static int tcp_get_file_handle(URLContext *h)
b34d9614b887 Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents: 4251
diff changeset
213 {
b34d9614b887 Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents: 4251
diff changeset
214 TCPContext *s = h->priv_data;
b34d9614b887 Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents: 4251
diff changeset
215 return s->fd;
b34d9614b887 Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents: 4251
diff changeset
216 }
b34d9614b887 Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents: 4251
diff changeset
217
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218 URLProtocol tcp_protocol = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219 "tcp",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220 tcp_open,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
221 tcp_read,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
222 tcp_write,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
223 NULL, /* seek */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
224 tcp_close,
4640
b34d9614b887 Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents: 4251
diff changeset
225 .url_get_file_handle = tcp_get_file_handle,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
226 };