Mercurial > libavformat.hg
annotate tcp.c @ 5685:e8614dbd9b7b libavformat
Fix memory leak for truncated packets in idCin demuxer
author | vitor |
---|---|
date | Sun, 21 Feb 2010 14:41:39 +0000 |
parents | 0980c09b05c1 |
children | b1a108ca71c5 |
rev | line source |
---|---|
0 | 1 /* |
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 | 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 | 8 * modify it under the terms of the GNU Lesser General Public |
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 | 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 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
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 | 20 */ |
21 #include "avformat.h" | |
22 #include <unistd.h> | |
1754 | 23 #include "network.h" |
2773 | 24 #include "os_support.h" |
4206 | 25 #if HAVE_SYS_SELECT_H |
3937
c0667b2aa3ab
include sys/select.h to get select, according to posix 2001,
bcoudurier
parents:
3765
diff
changeset
|
26 #include <sys/select.h> |
3941
53c5b89b8dff
only include sys/select.h if present, fix mingw compilation
bcoudurier
parents:
3937
diff
changeset
|
27 #endif |
180 | 28 #include <sys/time.h> |
0 | 29 |
30 typedef struct TCPContext { | |
31 int fd; | |
32 } TCPContext; | |
33 | |
34 /* return non zero if error */ | |
35 static int tcp_open(URLContext *h, const char *uri, int flags) | |
36 { | |
5518
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
37 struct addrinfo hints, *ai, *cur_ai; |
0 | 38 int port, fd = -1; |
683
095009fc2f35
kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
511
diff
changeset
|
39 TCPContext *s = NULL; |
180 | 40 fd_set wfds; |
41 int fd_max, ret; | |
42 struct timeval tv; | |
43 socklen_t optlen; | |
3765
d55fb12134d1
Remove check for @ in tcp.c which removes the authorization data from the
rbultje
parents:
3756
diff
changeset
|
44 char hostname[1024],proto[1024],path[1024]; |
5518
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
45 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
|
46 |
3753
42ed3629601d
Fix memleak on some OSes in case network initialization fails. See
rbultje
parents:
3752
diff
changeset
|
47 if(!ff_network_init()) |
42ed3629601d
Fix memleak on some OSes in case network initialization fails. See
rbultje
parents:
3752
diff
changeset
|
48 return AVERROR(EIO); |
42ed3629601d
Fix memleak on some OSes in case network initialization fails. See
rbultje
parents:
3752
diff
changeset
|
49 |
511
056991ab9f10
HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
michael
parents:
482
diff
changeset
|
50 url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), |
3756 | 51 &port, path, sizeof(path), uri); |
52 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
|
53 return AVERROR(EINVAL); |
885 | 54 |
5518
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
55 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
|
56 hints.ai_family = AF_UNSPEC; |
5518
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
57 hints.ai_socktype = SOCK_STREAM; |
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
58 snprintf(portstr, sizeof(portstr), "%d", port); |
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
59 if (getaddrinfo(hostname, portstr, &hints, &ai)) |
3755
b9c1bcc6c1ca
On failure, return directly because the fail: case does nothing. This also
rbultje
parents:
3754
diff
changeset
|
60 return AVERROR(EIO); |
0 | 61 |
5518
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
62 cur_ai = ai; |
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
63 |
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
64 restart: |
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
65 fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol); |
0 | 66 if (fd < 0) |
5518
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
67 goto fail; |
2057
857fbfeb2fa0
implement ff_socket_nonblock and use it in networking code
alex
parents:
2056
diff
changeset
|
68 ff_socket_nonblock(fd, 1); |
885 | 69 |
180 | 70 redo: |
5518
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
71 ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen); |
180 | 72 if (ret < 0) { |
2056
eeea52739ff3
use ff_neterrno() and FF_NETERROR() for networking error handling
alex
parents:
2050
diff
changeset
|
73 if (ff_neterrno() == FF_NETERROR(EINTR)) |
180 | 74 goto redo; |
2321 | 75 if (ff_neterrno() != FF_NETERROR(EINPROGRESS) && |
76 ff_neterrno() != FF_NETERROR(EAGAIN)) | |
180 | 77 goto fail; |
0 | 78 |
180 | 79 /* wait until we are connected or until abort */ |
80 for(;;) { | |
81 if (url_interrupt_cb()) { | |
1787
eb16c64144ee
This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents:
1754
diff
changeset
|
82 ret = AVERROR(EINTR); |
180 | 83 goto fail1; |
84 } | |
85 fd_max = fd; | |
86 FD_ZERO(&wfds); | |
87 FD_SET(fd, &wfds); | |
88 tv.tv_sec = 0; | |
89 tv.tv_usec = 100 * 1000; | |
90 ret = select(fd_max + 1, NULL, &wfds, NULL, &tv); | |
91 if (ret > 0 && FD_ISSET(fd, &wfds)) | |
92 break; | |
93 } | |
885 | 94 |
180 | 95 /* test error */ |
96 optlen = sizeof(ret); | |
97 getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen); | |
98 if (ret != 0) | |
99 goto fail; | |
100 } | |
3754
8d267b43eaba
Move malloc() down until after all initializations, so that the resource is
rbultje
parents:
3753
diff
changeset
|
101 s = av_malloc(sizeof(TCPContext)); |
5518
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
102 if (!s) { |
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
103 freeaddrinfo(ai); |
3754
8d267b43eaba
Move malloc() down until after all initializations, so that the resource is
rbultje
parents:
3753
diff
changeset
|
104 return AVERROR(ENOMEM); |
5518
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
105 } |
3754
8d267b43eaba
Move malloc() down until after all initializations, so that the resource is
rbultje
parents:
3753
diff
changeset
|
106 h->priv_data = s; |
8d267b43eaba
Move malloc() down until after all initializations, so that the resource is
rbultje
parents:
3753
diff
changeset
|
107 h->is_streamed = 1; |
0 | 108 s->fd = fd; |
5518
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
109 freeaddrinfo(ai); |
0 | 110 return 0; |
111 | |
112 fail: | |
5518
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
113 if (cur_ai->ai_next) { |
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
114 /* Retry with the next sockaddr */ |
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
115 cur_ai = cur_ai->ai_next; |
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
116 if (fd >= 0) |
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
117 closesocket(fd); |
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
118 goto restart; |
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
119 } |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2057
diff
changeset
|
120 ret = AVERROR(EIO); |
180 | 121 fail1: |
0 | 122 if (fd >= 0) |
1670 | 123 closesocket(fd); |
5518
0dc71c7f6653
Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsj
rbultje
parents:
5102
diff
changeset
|
124 freeaddrinfo(ai); |
180 | 125 return ret; |
0 | 126 } |
127 | |
65 | 128 static int tcp_read(URLContext *h, uint8_t *buf, int size) |
0 | 129 { |
130 TCPContext *s = h->priv_data; | |
388
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
131 int len, fd_max, ret; |
180 | 132 fd_set rfds; |
133 struct timeval tv; | |
0 | 134 |
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
|
135 for (;;) { |
180 | 136 if (url_interrupt_cb()) |
1787
eb16c64144ee
This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents:
1754
diff
changeset
|
137 return AVERROR(EINTR); |
180 | 138 fd_max = s->fd; |
139 FD_ZERO(&rfds); | |
140 FD_SET(s->fd, &rfds); | |
141 tv.tv_sec = 0; | |
142 tv.tv_usec = 100 * 1000; | |
388
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
143 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
|
144 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
|
145 len = recv(s->fd, buf, size, 0); |
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
146 if (len < 0) { |
2056
eeea52739ff3
use ff_neterrno() and FF_NETERROR() for networking error handling
alex
parents:
2050
diff
changeset
|
147 if (ff_neterrno() != FF_NETERROR(EINTR) && |
eeea52739ff3
use ff_neterrno() and FF_NETERROR() for networking error handling
alex
parents:
2050
diff
changeset
|
148 ff_neterrno() != FF_NETERROR(EAGAIN)) |
5102 | 149 return AVERROR(ff_neterrno()); |
388
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
150 } else return len; |
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
151 } else if (ret < 0) { |
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
152 return -1; |
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
153 } |
0 | 154 } |
155 } | |
156 | |
65 | 157 static int tcp_write(URLContext *h, uint8_t *buf, int size) |
0 | 158 { |
159 TCPContext *s = h->priv_data; | |
388
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
160 int ret, size1, fd_max, len; |
180 | 161 fd_set wfds; |
162 struct timeval tv; | |
0 | 163 |
164 size1 = size; | |
165 while (size > 0) { | |
180 | 166 if (url_interrupt_cb()) |
1787
eb16c64144ee
This fixes error handling for BeOS, removing the need for some ifdefs.
mmu_man
parents:
1754
diff
changeset
|
167 return AVERROR(EINTR); |
180 | 168 fd_max = s->fd; |
169 FD_ZERO(&wfds); | |
170 FD_SET(s->fd, &wfds); | |
171 tv.tv_sec = 0; | |
172 tv.tv_usec = 100 * 1000; | |
388
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
173 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
|
174 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
|
175 len = send(s->fd, buf, size, 0); |
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
176 if (len < 0) { |
2056
eeea52739ff3
use ff_neterrno() and FF_NETERROR() for networking error handling
alex
parents:
2050
diff
changeset
|
177 if (ff_neterrno() != FF_NETERROR(EINTR) && |
eeea52739ff3
use ff_neterrno() and FF_NETERROR() for networking error handling
alex
parents:
2050
diff
changeset
|
178 ff_neterrno() != FF_NETERROR(EAGAIN)) |
5102 | 179 return AVERROR(ff_neterrno()); |
388
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
180 continue; |
261
5f27f90ed496
Fix a very nasty problem with extra bytes appearing in TCP data streams.
philipjsg
parents:
229
diff
changeset
|
181 } |
388
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
182 size -= len; |
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
183 buf += len; |
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
184 } else if (ret < 0) { |
9af30d452a0a
tcp select() check and enables pressing 'q' when reading/(writing) from
michael
parents:
385
diff
changeset
|
185 return -1; |
261
5f27f90ed496
Fix a very nasty problem with extra bytes appearing in TCP data streams.
philipjsg
parents:
229
diff
changeset
|
186 } |
0 | 187 } |
188 return size1 - size; | |
189 } | |
190 | |
191 static int tcp_close(URLContext *h) | |
192 { | |
193 TCPContext *s = h->priv_data; | |
194 closesocket(s->fd); | |
2351
b9a881c0967e
Add initialization and cleanup functions for Winsock
ramiro
parents:
2321
diff
changeset
|
195 ff_network_close(); |
0 | 196 av_free(s); |
197 return 0; | |
198 } | |
199 | |
4640
b34d9614b887
Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents:
4251
diff
changeset
|
200 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
|
201 { |
b34d9614b887
Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents:
4251
diff
changeset
|
202 TCPContext *s = h->priv_data; |
b34d9614b887
Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents:
4251
diff
changeset
|
203 return s->fd; |
b34d9614b887
Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents:
4251
diff
changeset
|
204 } |
b34d9614b887
Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents:
4251
diff
changeset
|
205 |
0 | 206 URLProtocol tcp_protocol = { |
207 "tcp", | |
208 tcp_open, | |
209 tcp_read, | |
210 tcp_write, | |
211 NULL, /* seek */ | |
212 tcp_close, | |
4640
b34d9614b887
Add url_get_file_handle(), which is used to get the file descriptor
rbultje
parents:
4251
diff
changeset
|
213 .url_get_file_handle = tcp_get_file_handle, |
0 | 214 }; |