Mercurial > mplayer.hg
annotate stream/http.c @ 32549:cf1f4f5bc096
Set font_fontconfig to -1 if CONFIG_FONTCONFIG is not configured.
Without this, -font and -subfont do not work when using -ass.
author | komh |
---|---|
date | Sat, 20 Nov 2010 11:39:05 +0000 |
parents | 6a629e6fdb09 |
children | 683199947822 |
rev | line source |
---|---|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
1 /* |
902 | 2 * HTTP Helper |
30426
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
3 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
4 * Copyright (C) 2001 Bertrand Baudet <bertrand_baudet@yahoo.com> |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
5 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
6 * This file is part of MPlayer. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
7 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
8 * MPlayer is free software; you can redistribute it and/or modify |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
9 * it under the terms of the GNU General Public License as published by |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
10 * the Free Software Foundation; either version 2 of the License, or |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
11 * (at your option) any later version. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
12 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
13 * MPlayer is distributed in the hope that it will be useful, |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
16 * GNU General Public License for more details. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
17 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
18 * You should have received a copy of the GNU General Public License along |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
19 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30357
diff
changeset
|
20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
902 | 21 */ |
22 | |
15614
a4a46131ee71
Change header order to avoid compile error because of STREAM_SEEK
reimar
parents:
15585
diff
changeset
|
23 #include "config.h" |
a4a46131ee71
Change header order to avoid compile error because of STREAM_SEEK
reimar
parents:
15585
diff
changeset
|
24 |
870 | 25 #include <stdio.h> |
26 #include <stdlib.h> | |
27 #include <string.h> | |
15585 | 28 #include <unistd.h> |
870 | 29 |
28402 | 30 #if !HAVE_WINSOCK2_H |
27472
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
31 #else |
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
32 #include <winsock2.h> |
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
33 #include <ws2tcpip.h> |
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
34 #endif |
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
35 |
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
36 #include "http.h" |
4816
f1dea39a50bb
Fixed the http response parser when the http header only has the HTTP
bertrand
parents:
4311
diff
changeset
|
37 #include "url.h" |
5915 | 38 #include "mp_msg.h" |
870 | 39 |
15585 | 40 #include "stream.h" |
19312
ab8d6b6deb63
proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
ben
parents:
19271
diff
changeset
|
41 #include "libmpdemux/demuxer.h" |
15585 | 42 #include "network.h" |
43 #include "help_mp.h" | |
44 | |
45 | |
16013 | 46 typedef struct { |
47 unsigned metaint; | |
48 unsigned metapos; | |
49 int is_ultravox; | |
50 } scast_data_t; | |
51 | |
52 /** | |
53 * \brief first read any data from sc->buffer then from fd | |
54 * \param fd file descriptor to read data from | |
55 * \param buffer buffer to read into | |
56 * \param len how many bytes to read | |
57 * \param sc streaming control containing buffer to read from first | |
58 * \return len unless there is a read error or eof | |
59 */ | |
60 static unsigned my_read(int fd, char *buffer, int len, streaming_ctrl_t *sc) { | |
61 unsigned pos = 0; | |
62 unsigned cp_len = sc->buffer_size - sc->buffer_pos; | |
63 if (cp_len > len) | |
64 cp_len = len; | |
65 memcpy(buffer, &sc->buffer[sc->buffer_pos], cp_len); | |
66 sc->buffer_pos += cp_len; | |
67 pos += cp_len; | |
68 while (pos < len) { | |
16070 | 69 int ret = recv(fd, &buffer[pos], len - pos, 0); |
16013 | 70 if (ret <= 0) |
71 break; | |
72 pos += ret; | |
73 } | |
74 return pos; | |
75 } | |
76 | |
16032 | 77 /** |
78 * \brief read and process (i.e. discard *g*) a block of ultravox metadata | |
79 * \param fd file descriptor to read from | |
80 * \param sc streaming_ctrl_t whose buffer is consumed before reading from fd | |
81 * \return number of real data before next metadata block starts or 0 on error | |
82 */ | |
16013 | 83 static unsigned uvox_meta_read(int fd, streaming_ctrl_t *sc) { |
84 unsigned metaint; | |
16070 | 85 unsigned char info[6] = {0, 0, 0, 0, 0, 0}; |
86 int info_read; | |
16013 | 87 do { |
16070 | 88 info_read = my_read(fd, info, 1, sc); |
16013 | 89 if (info[0] == 0x00) |
16070 | 90 info_read = my_read(fd, info, 6, sc); |
16013 | 91 else |
16070 | 92 info_read += my_read(fd, &info[1], 5, sc); |
93 if (info_read != 6) // read error or eof | |
94 return 0; | |
16031
c2e78215f0d9
Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents:
16013
diff
changeset
|
95 // sync byte and reserved flags |
c2e78215f0d9
Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents:
16013
diff
changeset
|
96 if (info[0] != 0x5a || (info[1] & 0xfc) != 0x00) { |
16013 | 97 mp_msg(MSGT_DEMUXER, MSGL_ERR, "Invalid or unknown uvox metadata\n"); |
98 return 0; | |
99 } | |
16031
c2e78215f0d9
Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents:
16013
diff
changeset
|
100 if (info[1] & 0x01) |
c2e78215f0d9
Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents:
16013
diff
changeset
|
101 mp_msg(MSGT_DEMUXER, MSGL_WARN, "Encrypted ultravox data\n"); |
16013 | 102 metaint = info[4] << 8 | info[5]; |
16031
c2e78215f0d9
Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents:
16013
diff
changeset
|
103 if ((info[3] & 0xf) < 0x07) { // discard any metadata nonsense |
16013 | 104 char *metabuf = malloc(metaint); |
105 my_read(fd, metabuf, metaint, sc); | |
106 free(metabuf); | |
107 } | |
16031
c2e78215f0d9
Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents:
16013
diff
changeset
|
108 } while ((info[3] & 0xf) < 0x07); |
16013 | 109 return metaint; |
110 } | |
111 | |
112 /** | |
113 * \brief read one scast meta data entry and print it | |
16032 | 114 * \param fd file descriptor to read from |
115 * \param sc streaming_ctrl_t whose buffer is consumed before reading from fd | |
16013 | 116 */ |
117 static void scast_meta_read(int fd, streaming_ctrl_t *sc) { | |
118 unsigned char tmp = 0; | |
119 unsigned metalen; | |
120 my_read(fd, &tmp, 1, sc); | |
121 metalen = tmp * 16; | |
122 if (metalen > 0) { | |
30938 | 123 int i; |
30941
fb3bde3ec3a8
Change type to uint8_t to avoid checks depending on char signedness.
reimar
parents:
30938
diff
changeset
|
124 uint8_t *info = malloc(metalen + 1); |
16013 | 125 unsigned nlen = my_read(fd, info, metalen, sc); |
30938 | 126 // avoid breaking the user's terminal too much |
127 if (nlen > 256) nlen = 256; | |
128 for (i = 0; i < nlen; i++) | |
129 if (info[i] && info[i] < 32) info[i] = '?'; | |
16013 | 130 info[nlen] = 0; |
131 mp_msg(MSGT_DEMUXER, MSGL_INFO, "\nICY Info: %s\n", info); | |
132 free(info); | |
133 } | |
134 } | |
135 | |
16032 | 136 /** |
137 * \brief read data from scast/ultravox stream without any metadata | |
138 * \param fd file descriptor to read from | |
139 * \param buffer buffer to read data into | |
140 * \param size number of bytes to read | |
141 * \param sc streaming_ctrl_t whose buffer is consumed before reading from fd | |
142 */ | |
16013 | 143 static int scast_streaming_read(int fd, char *buffer, int size, |
144 streaming_ctrl_t *sc) { | |
145 scast_data_t *sd = (scast_data_t *)sc->data; | |
146 unsigned block, ret; | |
147 unsigned done = 0; | |
148 | |
149 // first read remaining data up to next metadata | |
150 block = sd->metaint - sd->metapos; | |
151 if (block > size) | |
152 block = size; | |
153 ret = my_read(fd, buffer, block, sc); | |
154 sd->metapos += ret; | |
155 done += ret; | |
156 if (ret != block) // read problems or eof | |
157 size = done; | |
158 | |
159 while (done < size) { // now comes the metadata | |
160 if (sd->is_ultravox) | |
16070 | 161 { |
16013 | 162 sd->metaint = uvox_meta_read(fd, sc); |
16070 | 163 if (!sd->metaint) |
164 size = done; | |
165 } | |
16013 | 166 else |
167 scast_meta_read(fd, sc); // read and display metadata | |
168 sd->metapos = 0; | |
169 block = size - done; | |
170 if (block > sd->metaint) | |
171 block = sd->metaint; | |
172 ret = my_read(fd, &buffer[done], block, sc); | |
173 sd->metapos += ret; | |
174 done += ret; | |
175 if (ret != block) // read problems or eof | |
176 size = done; | |
177 } | |
178 return done; | |
179 } | |
180 | |
181 static int scast_streaming_start(stream_t *stream) { | |
182 int metaint; | |
183 scast_data_t *scast_data; | |
184 HTTP_header_t *http_hdr = stream->streaming_ctrl->data; | |
16070 | 185 int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0; |
16013 | 186 if (!stream || stream->fd < 0 || !http_hdr) |
187 return -1; | |
188 if (is_ultravox) | |
189 metaint = 0; | |
190 else { | |
191 metaint = atoi(http_get_field(http_hdr, "Icy-MetaInt")); | |
192 if (metaint <= 0) | |
193 return -1; | |
194 } | |
195 stream->streaming_ctrl->buffer = malloc(http_hdr->body_size); | |
196 stream->streaming_ctrl->buffer_size = http_hdr->body_size; | |
197 stream->streaming_ctrl->buffer_pos = 0; | |
198 memcpy(stream->streaming_ctrl->buffer, http_hdr->body, http_hdr->body_size); | |
199 scast_data = malloc(sizeof(scast_data_t)); | |
200 scast_data->metaint = metaint; | |
201 scast_data->metapos = 0; | |
202 scast_data->is_ultravox = is_ultravox; | |
203 http_free(http_hdr); | |
204 stream->streaming_ctrl->data = scast_data; | |
205 stream->streaming_ctrl->streaming_read = scast_streaming_read; | |
206 stream->streaming_ctrl->streaming_seek = NULL; | |
207 stream->streaming_ctrl->prebuffer_size = 64 * 1024; // 64 KBytes | |
208 stream->streaming_ctrl->buffering = 1; | |
209 stream->streaming_ctrl->status = streaming_playing_e; | |
210 return 0; | |
211 } | |
212 | |
15585 | 213 static int nop_streaming_start( stream_t *stream ) { |
214 HTTP_header_t *http_hdr = NULL; | |
215 char *next_url=NULL; | |
216 URL_t *rd_url=NULL; | |
217 int fd,ret; | |
218 if( stream==NULL ) return -1; | |
219 | |
220 fd = stream->fd; | |
221 if( fd<0 ) { | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
222 fd = http_send_request( stream->streaming_ctrl->url, 0 ); |
15585 | 223 if( fd<0 ) return -1; |
224 http_hdr = http_read_response( fd ); | |
225 if( http_hdr==NULL ) return -1; | |
226 | |
227 switch( http_hdr->status_code ) { | |
228 case 200: // OK | |
229 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") ); | |
230 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") ); | |
231 if( http_hdr->body_size>0 ) { | |
232 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { | |
233 http_free( http_hdr ); | |
234 return -1; | |
235 } | |
236 } | |
237 break; | |
238 // Redirect | |
239 case 301: // Permanently | |
240 case 302: // Temporarily | |
19459
6dad4b1efb82
Handle 303 (See Other) redirect, part of a patch by Benjamin Zores (ben at geexbox org)
reimar
parents:
19312
diff
changeset
|
241 case 303: // See Other |
15585 | 242 ret=-1; |
243 next_url = http_get_field( http_hdr, "Location" ); | |
244 | |
245 if (next_url != NULL) | |
246 rd_url=url_new(next_url); | |
247 | |
248 if (next_url != NULL && rd_url != NULL) { | |
249 mp_msg(MSGT_NETWORK,MSGL_STATUS,"Redirected: Using this url instead %s\n",next_url); | |
250 stream->streaming_ctrl->url=check4proxies(rd_url); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
251 ret=nop_streaming_start(stream); //recursively get streaming started |
15585 | 252 } else { |
253 mp_msg(MSGT_NETWORK,MSGL_ERR,"Redirection failed\n"); | |
254 closesocket( fd ); | |
255 fd = -1; | |
256 } | |
257 return ret; | |
258 break; | |
259 case 401: //Authorization required | |
260 case 403: //Forbidden | |
261 case 404: //Not found | |
262 case 500: //Server Error | |
263 default: | |
264 mp_msg(MSGT_NETWORK,MSGL_ERR,"Server returned code %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); | |
265 closesocket( fd ); | |
266 fd = -1; | |
267 return -1; | |
268 break; | |
269 } | |
270 stream->fd = fd; | |
271 } else { | |
272 http_hdr = (HTTP_header_t*)stream->streaming_ctrl->data; | |
273 if( http_hdr->body_size>0 ) { | |
274 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { | |
275 http_free( http_hdr ); | |
276 stream->streaming_ctrl->data = NULL; | |
277 return -1; | |
278 } | |
279 } | |
280 } | |
281 | |
282 if( http_hdr ) { | |
283 http_free( http_hdr ); | |
284 stream->streaming_ctrl->data = NULL; | |
285 } | |
286 | |
287 stream->streaming_ctrl->streaming_read = nop_streaming_read; | |
288 stream->streaming_ctrl->streaming_seek = nop_streaming_seek; | |
289 stream->streaming_ctrl->prebuffer_size = 64*1024; // 64 KBytes | |
290 stream->streaming_ctrl->buffering = 1; | |
291 stream->streaming_ctrl->status = streaming_playing_e; | |
292 return 0; | |
293 } | |
294 | |
870 | 295 HTTP_header_t * |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
16948
diff
changeset
|
296 http_new_header(void) { |
870 | 297 HTTP_header_t *http_hdr; |
298 | |
18879 | 299 http_hdr = malloc(sizeof(HTTP_header_t)); |
870 | 300 if( http_hdr==NULL ) return NULL; |
301 memset( http_hdr, 0, sizeof(HTTP_header_t) ); | |
302 | |
303 return http_hdr; | |
304 } | |
305 | |
306 void | |
307 http_free( HTTP_header_t *http_hdr ) { | |
3039 | 308 HTTP_field_t *field, *field2free; |
870 | 309 if( http_hdr==NULL ) return; |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
310 free(http_hdr->protocol); |
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
311 free(http_hdr->uri); |
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
312 free(http_hdr->reason_phrase); |
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
313 free(http_hdr->field_search); |
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
314 free(http_hdr->method); |
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
315 free(http_hdr->buffer); |
3039 | 316 field = http_hdr->first_field; |
317 while( field!=NULL ) { | |
318 field2free = field; | |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
319 free(field->field_name); |
3039 | 320 field = field->next; |
321 free( field2free ); | |
322 } | |
870 | 323 free( http_hdr ); |
3039 | 324 http_hdr = NULL; |
870 | 325 } |
326 | |
902 | 327 int |
328 http_response_append( HTTP_header_t *http_hdr, char *response, int length ) { | |
1027 | 329 if( http_hdr==NULL || response==NULL || length<0 ) return -1; |
7304
7da2c2a68547
Check if realloc failed on http_hdr->buffer instead of ptr in http_response_append,
bertrand
parents:
7293
diff
changeset
|
330 |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18094
diff
changeset
|
331 if( (unsigned)length > SIZE_MAX - http_hdr->buffer_size - 1) { |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18094
diff
changeset
|
332 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Bad size in memory (re)allocation\n"); |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18094
diff
changeset
|
333 return -1; |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18094
diff
changeset
|
334 } |
30702 | 335 http_hdr->buffer = realloc( http_hdr->buffer, http_hdr->buffer_size+length+1 ); |
7304
7da2c2a68547
Check if realloc failed on http_hdr->buffer instead of ptr in http_response_append,
bertrand
parents:
7293
diff
changeset
|
336 if( http_hdr->buffer==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
337 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
902 | 338 return -1; |
339 } | |
7293 | 340 memcpy( http_hdr->buffer+http_hdr->buffer_size, response, length ); |
341 http_hdr->buffer_size += length; | |
342 http_hdr->buffer[http_hdr->buffer_size]=0; // close the string! | |
902 | 343 return http_hdr->buffer_size; |
344 } | |
345 | |
346 int | |
2489
0ecc1b4f7cf8
Added ASF http server streaming (Not mms streaming).
bertrand
parents:
2310
diff
changeset
|
347 http_is_header_entire( HTTP_header_t *http_hdr ) { |
902 | 348 if( http_hdr==NULL ) return -1; |
7293 | 349 if( http_hdr->buffer==NULL ) return 0; // empty |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
350 |
3784 | 351 if( strstr(http_hdr->buffer, "\r\n\r\n")==NULL && |
352 strstr(http_hdr->buffer, "\n\n")==NULL ) return 0; | |
353 return 1; | |
902 | 354 } |
355 | |
356 int | |
357 http_response_parse( HTTP_header_t *http_hdr ) { | |
870 | 358 char *hdr_ptr, *ptr; |
359 char *field=NULL; | |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18094
diff
changeset
|
360 int pos_hdr_sep, hdr_sep_len; |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18094
diff
changeset
|
361 size_t len; |
902 | 362 if( http_hdr==NULL ) return -1; |
363 if( http_hdr->is_parsed ) return 0; | |
870 | 364 |
365 // Get the protocol | |
902 | 366 hdr_ptr = strstr( http_hdr->buffer, " " ); |
870 | 367 if( hdr_ptr==NULL ) { |
5915 | 368 mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. No space separator found.\n"); |
902 | 369 return -1; |
870 | 370 } |
902 | 371 len = hdr_ptr-http_hdr->buffer; |
18879 | 372 http_hdr->protocol = malloc(len+1); |
870 | 373 if( http_hdr->protocol==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
374 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
902 | 375 return -1; |
870 | 376 } |
902 | 377 strncpy( http_hdr->protocol, http_hdr->buffer, len ); |
378 http_hdr->protocol[len]='\0'; | |
870 | 379 if( !strncasecmp( http_hdr->protocol, "HTTP", 4) ) { |
380 if( sscanf( http_hdr->protocol+5,"1.%d", &(http_hdr->http_minor_version) )!=1 ) { | |
5915 | 381 mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. Unable to get HTTP minor version.\n"); |
902 | 382 return -1; |
870 | 383 } |
384 } | |
385 | |
386 // Get the status code | |
387 if( sscanf( ++hdr_ptr, "%d", &(http_hdr->status_code) )!=1 ) { | |
5915 | 388 mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. Unable to get status code.\n"); |
902 | 389 return -1; |
870 | 390 } |
391 hdr_ptr += 4; | |
392 | |
393 // Get the reason phrase | |
3514
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
394 ptr = strstr( hdr_ptr, "\n" ); |
870 | 395 if( hdr_ptr==NULL ) { |
5915 | 396 mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. Unable to get the reason phrase.\n"); |
902 | 397 return -1; |
870 | 398 } |
399 len = ptr-hdr_ptr; | |
18879 | 400 http_hdr->reason_phrase = malloc(len+1); |
870 | 401 if( http_hdr->reason_phrase==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
402 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
902 | 403 return -1; |
870 | 404 } |
405 strncpy( http_hdr->reason_phrase, hdr_ptr, len ); | |
4311 | 406 if( http_hdr->reason_phrase[len-1]=='\r' ) { |
407 len--; | |
408 } | |
870 | 409 http_hdr->reason_phrase[len]='\0'; |
410 | |
411 // Set the position of the header separator: \r\n\r\n | |
8179
63a5e03f4346
Removed hard coded value for the length of the header separator.
bertrand
parents:
7304
diff
changeset
|
412 hdr_sep_len = 4; |
902 | 413 ptr = strstr( http_hdr->buffer, "\r\n\r\n" ); |
870 | 414 if( ptr==NULL ) { |
3514
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
415 ptr = strstr( http_hdr->buffer, "\n\n" ); |
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
416 if( ptr==NULL ) { |
5915 | 417 mp_msg(MSGT_NETWORK,MSGL_ERR,"Header may be incomplete. No CRLF CRLF found.\n"); |
3514
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
418 return -1; |
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
419 } |
8179
63a5e03f4346
Removed hard coded value for the length of the header separator.
bertrand
parents:
7304
diff
changeset
|
420 hdr_sep_len = 2; |
870 | 421 } |
902 | 422 pos_hdr_sep = ptr-http_hdr->buffer; |
870 | 423 |
3514
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
424 // Point to the first line after the method line. |
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
425 hdr_ptr = strstr( http_hdr->buffer, "\n" )+1; |
870 | 426 do { |
3514
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
427 ptr = hdr_ptr; |
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
428 while( *ptr!='\r' && *ptr!='\n' ) ptr++; |
870 | 429 len = ptr-hdr_ptr; |
4816
f1dea39a50bb
Fixed the http response parser when the http header only has the HTTP
bertrand
parents:
4311
diff
changeset
|
430 if( len==0 ) break; |
30702 | 431 field = realloc(field, len+1); |
870 | 432 if( field==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
433 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MemAllocFailed); |
902 | 434 return -1; |
870 | 435 } |
436 strncpy( field, hdr_ptr, len ); | |
437 field[len]='\0'; | |
438 http_set_field( http_hdr, field ); | |
3514
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
439 hdr_ptr = ptr+((*ptr=='\r')?2:1); |
902 | 440 } while( hdr_ptr<(http_hdr->buffer+pos_hdr_sep) ); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
441 |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
442 free(field); |
870 | 443 |
8179
63a5e03f4346
Removed hard coded value for the length of the header separator.
bertrand
parents:
7304
diff
changeset
|
444 if( pos_hdr_sep+hdr_sep_len<http_hdr->buffer_size ) { |
870 | 445 // Response has data! |
8179
63a5e03f4346
Removed hard coded value for the length of the header separator.
bertrand
parents:
7304
diff
changeset
|
446 http_hdr->body = http_hdr->buffer+pos_hdr_sep+hdr_sep_len; |
63a5e03f4346
Removed hard coded value for the length of the header separator.
bertrand
parents:
7304
diff
changeset
|
447 http_hdr->body_size = http_hdr->buffer_size-(pos_hdr_sep+hdr_sep_len); |
870 | 448 } |
449 | |
902 | 450 http_hdr->is_parsed = 1; |
451 return 0; | |
870 | 452 } |
453 | |
454 char * | |
902 | 455 http_build_request( HTTP_header_t *http_hdr ) { |
3497 | 456 char *ptr, *uri=NULL; |
902 | 457 int len; |
3039 | 458 HTTP_field_t *field; |
870 | 459 if( http_hdr==NULL ) return NULL; |
460 | |
461 if( http_hdr->method==NULL ) http_set_method( http_hdr, "GET"); | |
462 if( http_hdr->uri==NULL ) http_set_uri( http_hdr, "/"); | |
3497 | 463 else { |
18879 | 464 uri = malloc(strlen(http_hdr->uri) + 1); |
3497 | 465 if( uri==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
466 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MemAllocFailed); |
3497 | 467 return NULL; |
468 } | |
12391 | 469 strcpy(uri,http_hdr->uri); |
3497 | 470 } |
870 | 471 |
3497 | 472 //**** Compute the request length |
473 // Add the Method line | |
474 len = strlen(http_hdr->method)+strlen(uri)+12; | |
475 // Add the fields | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
476 field = http_hdr->first_field; |
3039 | 477 while( field!=NULL ) { |
478 len += strlen(field->field_name)+2; | |
479 field = field->next; | |
480 } | |
3497 | 481 // Add the CRLF |
482 len += 2; | |
483 // Add the body | |
902 | 484 if( http_hdr->body!=NULL ) { |
485 len += http_hdr->body_size; | |
486 } | |
3497 | 487 // Free the buffer if it was previously used |
902 | 488 if( http_hdr->buffer!=NULL ) { |
489 free( http_hdr->buffer ); | |
490 http_hdr->buffer = NULL; | |
491 } | |
18879 | 492 http_hdr->buffer = malloc(len+1); |
902 | 493 if( http_hdr->buffer==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
494 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MemAllocFailed); |
902 | 495 return NULL; |
496 } | |
497 http_hdr->buffer_size = len; | |
498 | |
3497 | 499 //*** Building the request |
902 | 500 ptr = http_hdr->buffer; |
3497 | 501 // Add the method line |
502 ptr += sprintf( ptr, "%s %s HTTP/1.%d\r\n", http_hdr->method, uri, http_hdr->http_minor_version ); | |
3039 | 503 field = http_hdr->first_field; |
3497 | 504 // Add the field |
3039 | 505 while( field!=NULL ) { |
506 ptr += sprintf( ptr, "%s\r\n", field->field_name ); | |
507 field = field->next; | |
508 } | |
870 | 509 ptr += sprintf( ptr, "\r\n" ); |
3497 | 510 // Add the body |
870 | 511 if( http_hdr->body!=NULL ) { |
512 memcpy( ptr, http_hdr->body, http_hdr->body_size ); | |
513 } | |
3497 | 514 |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
515 free(uri); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
516 return http_hdr->buffer; |
870 | 517 } |
518 | |
519 char * | |
520 http_get_field( HTTP_header_t *http_hdr, const char *field_name ) { | |
521 if( http_hdr==NULL || field_name==NULL ) return NULL; | |
3039 | 522 http_hdr->field_search_pos = http_hdr->first_field; |
30702 | 523 http_hdr->field_search = realloc( http_hdr->field_search, strlen(field_name)+1 ); |
870 | 524 if( http_hdr->field_search==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
525 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
870 | 526 return NULL; |
527 } | |
528 strcpy( http_hdr->field_search, field_name ); | |
529 return http_get_next_field( http_hdr ); | |
530 } | |
531 | |
532 char * | |
533 http_get_next_field( HTTP_header_t *http_hdr ) { | |
534 char *ptr; | |
3039 | 535 HTTP_field_t *field; |
870 | 536 if( http_hdr==NULL ) return NULL; |
537 | |
3039 | 538 field = http_hdr->field_search_pos; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
539 while( field!=NULL ) { |
3039 | 540 ptr = strstr( field->field_name, ":" ); |
870 | 541 if( ptr==NULL ) return NULL; |
3039 | 542 if( !strncasecmp( field->field_name, http_hdr->field_search, ptr-(field->field_name) ) ) { |
870 | 543 ptr++; // Skip the column |
544 while( ptr[0]==' ' ) ptr++; // Skip the spaces if there is some | |
3039 | 545 http_hdr->field_search_pos = field->next; |
870 | 546 return ptr; // return the value without the field name |
547 } | |
3039 | 548 field = field->next; |
870 | 549 } |
550 return NULL; | |
551 } | |
552 | |
553 void | |
3039 | 554 http_set_field( HTTP_header_t *http_hdr, const char *field_name ) { |
555 HTTP_field_t *new_field; | |
556 if( http_hdr==NULL || field_name==NULL ) return; | |
870 | 557 |
18879 | 558 new_field = malloc(sizeof(HTTP_field_t)); |
3039 | 559 if( new_field==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
560 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
870 | 561 return; |
562 } | |
3039 | 563 new_field->next = NULL; |
18879 | 564 new_field->field_name = malloc(strlen(field_name)+1); |
3039 | 565 if( new_field->field_name==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
566 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
27834
d35bcab9833b
Avoid a memleak if allocation of field_name fails, fixes bug #1319.
reimar
parents:
27473
diff
changeset
|
567 free(new_field); |
3039 | 568 return; |
569 } | |
570 strcpy( new_field->field_name, field_name ); | |
571 | |
572 if( http_hdr->last_field==NULL ) { | |
573 http_hdr->first_field = new_field; | |
574 } else { | |
575 http_hdr->last_field->next = new_field; | |
576 } | |
577 http_hdr->last_field = new_field; | |
870 | 578 http_hdr->field_nb++; |
579 } | |
580 | |
581 void | |
582 http_set_method( HTTP_header_t *http_hdr, const char *method ) { | |
583 if( http_hdr==NULL || method==NULL ) return; | |
584 | |
18879 | 585 http_hdr->method = malloc(strlen(method)+1); |
870 | 586 if( http_hdr->method==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
587 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
870 | 588 return; |
589 } | |
590 strcpy( http_hdr->method, method ); | |
591 } | |
592 | |
593 void | |
594 http_set_uri( HTTP_header_t *http_hdr, const char *uri ) { | |
595 if( http_hdr==NULL || uri==NULL ) return; | |
596 | |
18879 | 597 http_hdr->uri = malloc(strlen(uri)+1); |
870 | 598 if( http_hdr->uri==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
599 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
870 | 600 return; |
601 } | |
602 strcpy( http_hdr->uri, uri ); | |
603 } | |
604 | |
32547
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
605 static int |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
606 http_add_authentication( HTTP_header_t *http_hdr, const char *username, const char *password, const char *auth_str ) { |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
607 char *auth = NULL, *usr_pass = NULL, *b64_usr_pass = NULL; |
6514 | 608 int encoded_len, pass_len=0, out_len; |
32547
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
609 size_t auth_len; |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
610 int res = -1; |
6514 | 611 if( http_hdr==NULL || username==NULL ) return -1; |
612 | |
613 if( password!=NULL ) { | |
614 pass_len = strlen(password); | |
615 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
616 |
18879 | 617 usr_pass = malloc(strlen(username)+pass_len+2); |
6514 | 618 if( usr_pass==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
619 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
620 goto out; |
6514 | 621 } |
622 | |
623 sprintf( usr_pass, "%s:%s", username, (password==NULL)?"":password ); | |
624 | |
625 // Base 64 encode with at least 33% more data than the original size | |
626 encoded_len = strlen(usr_pass)*2; | |
18879 | 627 b64_usr_pass = malloc(encoded_len); |
6514 | 628 if( b64_usr_pass==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
629 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
630 goto out; |
6514 | 631 } |
632 | |
633 out_len = base64_encode( usr_pass, strlen(usr_pass), b64_usr_pass, encoded_len); | |
634 if( out_len<0 ) { | |
635 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Base64 out overflow\n"); | |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
636 goto out; |
6514 | 637 } |
638 | |
639 b64_usr_pass[out_len]='\0'; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
640 |
32547
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
641 auth_len = encoded_len + 100; |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
642 auth = malloc(auth_len); |
6514 | 643 if( auth==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
644 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
645 goto out; |
6514 | 646 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
647 |
32547
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
648 snprintf(auth, auth_len, "%s: Basic %s", auth_str, b64_usr_pass); |
6514 | 649 http_set_field( http_hdr, auth ); |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
650 res = 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
651 |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
652 out: |
6514 | 653 free( usr_pass ); |
654 free( b64_usr_pass ); | |
655 free( auth ); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
656 |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
657 return res; |
6514 | 658 } |
659 | |
32547
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
660 int |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
661 http_add_basic_authentication( HTTP_header_t *http_hdr, const char *username, const char *password ) { |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
662 return http_add_authentication(http_hdr, username, password, "Authorization"); |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
663 } |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
664 |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
665 int |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
666 http_add_basic_proxy_authentication( HTTP_header_t *http_hdr, const char *username, const char *password ) { |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
667 return http_add_authentication(http_hdr, username, password, "Proxy-Authorization"); |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
668 } |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
669 |
870 | 670 void |
671 http_debug_hdr( HTTP_header_t *http_hdr ) { | |
3039 | 672 HTTP_field_t *field; |
673 int i = 0; | |
902 | 674 if( http_hdr==NULL ) return; |
870 | 675 |
5915 | 676 mp_msg(MSGT_NETWORK,MSGL_V,"--- HTTP DEBUG HEADER --- START ---\n"); |
677 mp_msg(MSGT_NETWORK,MSGL_V,"protocol: [%s]\n", http_hdr->protocol ); | |
678 mp_msg(MSGT_NETWORK,MSGL_V,"http minor version: [%d]\n", http_hdr->http_minor_version ); | |
679 mp_msg(MSGT_NETWORK,MSGL_V,"uri: [%s]\n", http_hdr->uri ); | |
680 mp_msg(MSGT_NETWORK,MSGL_V,"method: [%s]\n", http_hdr->method ); | |
681 mp_msg(MSGT_NETWORK,MSGL_V,"status code: [%d]\n", http_hdr->status_code ); | |
682 mp_msg(MSGT_NETWORK,MSGL_V,"reason phrase: [%s]\n", http_hdr->reason_phrase ); | |
31854
c680009d6779
Add 'z' length modifier to %d printf format specifier for size_t argument.
diego
parents:
31427
diff
changeset
|
683 mp_msg(MSGT_NETWORK,MSGL_V,"body size: [%zd]\n", http_hdr->body_size ); |
870 | 684 |
5915 | 685 mp_msg(MSGT_NETWORK,MSGL_V,"Fields:\n"); |
3039 | 686 field = http_hdr->first_field; |
687 while( field!=NULL ) { | |
5915 | 688 mp_msg(MSGT_NETWORK,MSGL_V," %d - %s\n", i++, field->field_name ); |
3039 | 689 field = field->next; |
690 } | |
5915 | 691 mp_msg(MSGT_NETWORK,MSGL_V,"--- HTTP DEBUG HEADER --- END ---\n"); |
870 | 692 } |
6514 | 693 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
694 int |
6514 | 695 base64_encode(const void *enc, int encLen, char *out, int outMax) { |
17778
37bfcf89c89c
Fix base64 encoding for basic auth according to RFC.
reimar
parents:
17566
diff
changeset
|
696 static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; |
6514 | 697 |
698 unsigned char *encBuf; | |
699 int outLen; | |
700 unsigned int bits; | |
701 unsigned int shift; | |
702 | |
703 encBuf = (unsigned char*)enc; | |
704 outLen = 0; | |
705 bits = 0; | |
706 shift = 0; | |
17778
37bfcf89c89c
Fix base64 encoding for basic auth according to RFC.
reimar
parents:
17566
diff
changeset
|
707 outMax &= ~3; |
6514 | 708 |
22031 | 709 while(1) { |
6514 | 710 if( encLen>0 ) { |
711 // Shift in byte | |
712 bits <<= 8; | |
713 bits |= *encBuf; | |
714 shift += 8; | |
715 // Next byte | |
716 encBuf++; | |
717 encLen--; | |
718 } else if( shift>0 ) { | |
719 // Pad last bits to 6 bits - will end next loop | |
720 bits <<= 6 - shift; | |
721 shift = 6; | |
722 } else { | |
17778
37bfcf89c89c
Fix base64 encoding for basic auth according to RFC.
reimar
parents:
17566
diff
changeset
|
723 // As per RFC 2045, section 6.8, |
37bfcf89c89c
Fix base64 encoding for basic auth according to RFC.
reimar
parents:
17566
diff
changeset
|
724 // pad output as necessary: 0 to 2 '=' chars. |
37bfcf89c89c
Fix base64 encoding for basic auth according to RFC.
reimar
parents:
17566
diff
changeset
|
725 while( outLen & 3 ){ |
37bfcf89c89c
Fix base64 encoding for basic auth according to RFC.
reimar
parents:
17566
diff
changeset
|
726 *out++ = '='; |
37bfcf89c89c
Fix base64 encoding for basic auth according to RFC.
reimar
parents:
17566
diff
changeset
|
727 outLen++; |
37bfcf89c89c
Fix base64 encoding for basic auth according to RFC.
reimar
parents:
17566
diff
changeset
|
728 } |
6514 | 729 |
730 return outLen; | |
731 } | |
732 | |
733 // Encode 6 bit segments | |
734 while( shift>=6 ) { | |
22031 | 735 if (outLen >= outMax) |
736 return -1; | |
6514 | 737 shift -= 6; |
738 *out = b64[ (bits >> shift) & 0x3F ]; | |
739 out++; | |
740 outLen++; | |
741 } | |
742 } | |
743 } | |
744 | |
25970
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
745 static void print_icy_metadata(HTTP_header_t *http_hdr) { |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
746 const char *field_data; |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
747 // note: I skip icy-notice1 and 2, as they contain html <BR> |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
748 // and are IMHO useless info ::atmos |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
749 if( (field_data = http_get_field(http_hdr, "icy-name")) != NULL ) |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
750 mp_msg(MSGT_NETWORK,MSGL_INFO,"Name : %s\n", field_data); |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
751 if( (field_data = http_get_field(http_hdr, "icy-genre")) != NULL ) |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
752 mp_msg(MSGT_NETWORK,MSGL_INFO,"Genre : %s\n", field_data); |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
753 if( (field_data = http_get_field(http_hdr, "icy-url")) != NULL ) |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
754 mp_msg(MSGT_NETWORK,MSGL_INFO,"Website: %s\n", field_data); |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
755 // XXX: does this really mean public server? ::atmos |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
756 if( (field_data = http_get_field(http_hdr, "icy-pub")) != NULL ) |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
757 mp_msg(MSGT_NETWORK,MSGL_INFO,"Public : %s\n", atoi(field_data)?"yes":"no"); |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
758 if( (field_data = http_get_field(http_hdr, "icy-br")) != NULL ) |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
759 mp_msg(MSGT_NETWORK,MSGL_INFO,"Bitrate: %skbit/s\n", field_data); |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
760 } |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
761 |
21567 | 762 //! If this function succeeds you must closesocket stream->fd |
15585 | 763 static int http_streaming_start(stream_t *stream, int* file_format) { |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
764 HTTP_header_t *http_hdr = NULL; |
15585 | 765 unsigned int i; |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
766 int fd = stream->fd; |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
767 int res = STREAM_UNSUPPORTED; |
15585 | 768 int redirect = 0; |
769 int auth_retry=0; | |
770 int seekable=0; | |
771 char *content_type; | |
30357
3fdf04500df2
Handle Content-Length also when Content-Type is not set.
reimar
parents:
30356
diff
changeset
|
772 const char *content_length; |
15585 | 773 char *next_url; |
774 URL_t *url = stream->streaming_ctrl->url; | |
6514 | 775 |
15585 | 776 do |
777 { | |
21541
3b4ed8857b38
Fix potential endless loop in http_streaming_start due
reimar
parents:
21540
diff
changeset
|
778 redirect = 0; |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
779 if (fd > 0) closesocket(fd); |
15585 | 780 fd = http_send_request( url, 0 ); |
781 if( fd<0 ) { | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
782 goto err_out; |
15585 | 783 } |
784 | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
785 http_free(http_hdr); |
15585 | 786 http_hdr = http_read_response( fd ); |
787 if( http_hdr==NULL ) { | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
788 goto err_out; |
15585 | 789 } |
790 | |
17932 | 791 if( mp_msg_test(MSGT_NETWORK,MSGL_V) ) { |
15585 | 792 http_debug_hdr( http_hdr ); |
793 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
794 |
15585 | 795 // Check if we can make partial content requests and thus seek in http-streams |
796 if( http_hdr!=NULL && http_hdr->status_code==200 ) { | |
30106 | 797 const char *accept_ranges = http_get_field(http_hdr,"Accept-Ranges"); |
30105
31b7d4637b50
Fix crash if http reply contains neither "Accept-Ranges" nor "Server" fields.
reimar
parents:
30103
diff
changeset
|
798 const char *server = http_get_field(http_hdr, "Server"); |
30106 | 799 if (accept_ranges) |
15585 | 800 seekable = strncmp(accept_ranges,"bytes",5)==0; |
30105
31b7d4637b50
Fix crash if http reply contains neither "Accept-Ranges" nor "Server" fields.
reimar
parents:
30103
diff
changeset
|
801 else if (server && strcmp(server, "gvs 1.0") == 0) |
30103
f7af93ece976
Add a hack for broken youtube servers not returning Accept-Ranges.
reimar
parents:
29920
diff
changeset
|
802 seekable = 1; // HACK for youtube incorrectly claiming not to support seeking |
15585 | 803 } |
804 | |
25971
64b1e4ea04fc
Always display Icy-Metadata if available, whether we recognize an ICY-Server
reimar
parents:
25970
diff
changeset
|
805 print_icy_metadata(http_hdr); |
64b1e4ea04fc
Always display Icy-Metadata if available, whether we recognize an ICY-Server
reimar
parents:
25970
diff
changeset
|
806 |
15585 | 807 // Check if the response is an ICY status_code reason_phrase |
25968
c7f41f9e2eb8
Detect IceCast also by Icy-MetaInt header part in http_streaming_start(),
reimar
parents:
25246
diff
changeset
|
808 if( !strcasecmp(http_hdr->protocol, "ICY") || |
c7f41f9e2eb8
Detect IceCast also by Icy-MetaInt header part in http_streaming_start(),
reimar
parents:
25246
diff
changeset
|
809 http_get_field(http_hdr, "Icy-MetaInt") ) { |
15585 | 810 switch( http_hdr->status_code ) { |
811 case 200: { // OK | |
25969 | 812 char *field_data; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
813 // If content-type == video/nsv we most likely have a winamp video stream |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
814 // otherwise it should be mp3. if there are more types consider adding mime type |
15585 | 815 // handling like later |
816 if ( (field_data = http_get_field(http_hdr, "content-type")) != NULL && (!strcmp(field_data, "video/nsv") || !strcmp(field_data, "misc/ultravox"))) | |
817 *file_format = DEMUXER_TYPE_NSV; | |
16948
9b7925705f5b
Add another content-type for aac audio in shoutcast streams
rtognimp
parents:
16932
diff
changeset
|
818 else if ( (field_data = http_get_field(http_hdr, "content-type")) != NULL && (!strcmp(field_data, "audio/aacp") || !strcmp(field_data, "audio/aac"))) |
16917
c45409728a9d
Use correct demuxer type for aac in shoutcast streams
rtognimp
parents:
16614
diff
changeset
|
819 *file_format = DEMUXER_TYPE_AAC; |
15585 | 820 else |
821 *file_format = DEMUXER_TYPE_AUDIO; | |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
822 res = STREAM_ERROR; |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
823 goto out; |
15585 | 824 } |
825 case 400: // Server Full | |
826 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server is full, skipping!\n"); | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
827 goto err_out; |
15585 | 828 case 401: // Service Unavailable |
829 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server return service unavailable, skipping!\n"); | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
830 goto err_out; |
15585 | 831 case 403: // Service Forbidden |
832 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server return 'Service Forbidden'\n"); | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
833 goto err_out; |
15585 | 834 case 404: // Resource Not Found |
835 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server couldn't find requested stream, skipping!\n"); | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
836 goto err_out; |
15585 | 837 default: |
838 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: unhandled ICY-Errorcode, contact MPlayer developers!\n"); | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
839 goto err_out; |
15585 | 840 } |
841 } | |
842 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
843 // Assume standard http if not ICY |
15585 | 844 switch( http_hdr->status_code ) { |
845 case 200: // OK | |
30357
3fdf04500df2
Handle Content-Length also when Content-Type is not set.
reimar
parents:
30356
diff
changeset
|
846 content_length = http_get_field(http_hdr, "Content-Length"); |
3fdf04500df2
Handle Content-Length also when Content-Type is not set.
reimar
parents:
30356
diff
changeset
|
847 if (content_length) { |
3fdf04500df2
Handle Content-Length also when Content-Type is not set.
reimar
parents:
30356
diff
changeset
|
848 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", content_length); |
3fdf04500df2
Handle Content-Length also when Content-Type is not set.
reimar
parents:
30356
diff
changeset
|
849 stream->end_pos = atoll(content_length); |
3fdf04500df2
Handle Content-Length also when Content-Type is not set.
reimar
parents:
30356
diff
changeset
|
850 } |
15585 | 851 // Look if we can use the Content-Type |
852 content_type = http_get_field( http_hdr, "Content-Type" ); | |
853 if( content_type!=NULL ) { | |
854 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", content_type ); | |
855 // Check in the mime type table for a demuxer type | |
856 i = 0; | |
857 while(mime_type_table[i].mime_type != NULL) { | |
858 if( !strcasecmp( content_type, mime_type_table[i].mime_type ) ) { | |
859 *file_format = mime_type_table[i].demuxer_type; | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
860 res = seekable; |
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
861 goto out; |
15585 | 862 } |
863 i++; | |
864 } | |
865 } | |
866 // Not found in the mime type table, don't fail, | |
867 // we should try raw HTTP | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
868 res = seekable; |
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
869 goto out; |
15585 | 870 // Redirect |
871 case 301: // Permanently | |
872 case 302: // Temporarily | |
19459
6dad4b1efb82
Handle 303 (See Other) redirect, part of a patch by Benjamin Zores (ben at geexbox org)
reimar
parents:
19312
diff
changeset
|
873 case 303: // See Other |
15585 | 874 // TODO: RFC 2616, recommand to detect infinite redirection loops |
875 next_url = http_get_field( http_hdr, "Location" ); | |
876 if( next_url!=NULL ) { | |
25238
f42b8e689416
Preserve unsv:// protocol specifier over http redirects.
reimar
parents:
25211
diff
changeset
|
877 int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0; |
20784
720206eef78b
Support URL redirections that do not specify full URL.
reimar
parents:
20185
diff
changeset
|
878 stream->streaming_ctrl->url = url_redirect( &url, next_url ); |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
879 if (!strcasecmp(url->protocol, "mms")) { |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
880 res = STREAM_REDIRECTED; |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
881 goto err_out; |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
882 } |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
883 if (strcasecmp(url->protocol, "http")) { |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
884 mp_msg(MSGT_NETWORK,MSGL_ERR,"Unsupported http %d redirect to %s protocol\n", http_hdr->status_code, url->protocol); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
885 goto err_out; |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
886 } |
25238
f42b8e689416
Preserve unsv:// protocol specifier over http redirects.
reimar
parents:
25211
diff
changeset
|
887 if (is_ultravox) { |
f42b8e689416
Preserve unsv:// protocol specifier over http redirects.
reimar
parents:
25211
diff
changeset
|
888 free(url->protocol); |
f42b8e689416
Preserve unsv:// protocol specifier over http redirects.
reimar
parents:
25211
diff
changeset
|
889 url->protocol = strdup("unsv"); |
f42b8e689416
Preserve unsv:// protocol specifier over http redirects.
reimar
parents:
25211
diff
changeset
|
890 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
891 redirect = 1; |
15585 | 892 } |
893 break; | |
894 case 401: // Authentication required | |
21566
79d969f9eec0
STREAM_UNSUPPORTED is -1, so use the former for return value in all places.
reimar
parents:
21565
diff
changeset
|
895 if( http_authenticate(http_hdr, url, &auth_retry)<0 ) |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
896 goto err_out; |
15585 | 897 redirect = 1; |
898 break; | |
899 default: | |
900 mp_msg(MSGT_NETWORK,MSGL_ERR,"Server returned %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
901 goto err_out; |
15585 | 902 } |
903 } while( redirect ); | |
904 | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
905 err_out: |
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
906 if (fd > 0) closesocket( fd ); |
21565
546cf4a6377a
Make sure stream->fd is set correct (esp. to -1 on error when fd is closed)
reimar
parents:
21542
diff
changeset
|
907 fd = -1; |
21542 | 908 http_free( http_hdr ); |
21776 | 909 http_hdr = NULL; |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
910 out: |
21776 | 911 stream->streaming_ctrl->data = (void*)http_hdr; |
21565
546cf4a6377a
Make sure stream->fd is set correct (esp. to -1 on error when fd is closed)
reimar
parents:
21542
diff
changeset
|
912 stream->fd = fd; |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
913 return res; |
15585 | 914 } |
915 | |
916 static int fixup_open(stream_t *stream,int seekable) { | |
16013 | 917 HTTP_header_t *http_hdr = stream->streaming_ctrl->data; |
16078
095e980cf7c0
Some ICY servers (e.g. http://broadcast.spnet.net:8000/darikhigh) do not set
reimar
parents:
16070
diff
changeset
|
918 int is_icy = http_hdr && http_get_field(http_hdr, "Icy-MetaInt"); |
16070 | 919 int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0; |
15585 | 920 |
921 stream->type = STREAMTYPE_STREAM; | |
16013 | 922 if(!is_icy && !is_ultravox && seekable) |
15585 | 923 { |
29920
4f740437ed2b
Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents:
29263
diff
changeset
|
924 stream->flags |= MP_STREAM_SEEK; |
15585 | 925 stream->seek = http_seek; |
926 } | |
927 stream->streaming_ctrl->bandwidth = network_bandwidth; | |
16013 | 928 if ((!is_icy && !is_ultravox) || scast_streaming_start(stream)) |
15585 | 929 if(nop_streaming_start( stream )) { |
930 mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_start failed\n"); | |
21567 | 931 if (stream->fd >= 0) |
932 closesocket(stream->fd); | |
933 stream->fd = -1; | |
15585 | 934 streaming_ctrl_free(stream->streaming_ctrl); |
935 stream->streaming_ctrl = NULL; | |
24257 | 936 return STREAM_UNSUPPORTED; |
15585 | 937 } |
938 | |
939 fixup_network_stream_cache(stream); | |
940 return STREAM_OK; | |
941 } | |
942 | |
943 static int open_s1(stream_t *stream,int mode, void* opts, int* file_format) { | |
944 int seekable=0; | |
945 URL_t *url; | |
946 | |
947 stream->streaming_ctrl = streaming_ctrl_new(); | |
948 if( stream->streaming_ctrl==NULL ) { | |
949 return STREAM_ERROR; | |
950 } | |
951 stream->streaming_ctrl->bandwidth = network_bandwidth; | |
952 url = url_new(stream->url); | |
953 stream->streaming_ctrl->url = check4proxies(url); | |
16417 | 954 url_free(url); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
955 |
20185 | 956 mp_msg(MSGT_OPEN, MSGL_V, "STREAM_HTTP(1), URL: %s\n", stream->url); |
15585 | 957 seekable = http_streaming_start(stream, file_format); |
958 if((seekable < 0) || (*file_format == DEMUXER_TYPE_ASF)) { | |
21567 | 959 if (stream->fd >= 0) |
960 closesocket(stream->fd); | |
961 stream->fd = -1; | |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
962 if (seekable == STREAM_REDIRECTED) |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
963 return seekable; |
15585 | 964 streaming_ctrl_free(stream->streaming_ctrl); |
965 stream->streaming_ctrl = NULL; | |
24257 | 966 return STREAM_UNSUPPORTED; |
15585 | 967 } |
968 | |
969 return fixup_open(stream, seekable); | |
970 } | |
971 | |
972 static int open_s2(stream_t *stream,int mode, void* opts, int* file_format) { | |
973 int seekable=0; | |
974 URL_t *url; | |
975 | |
976 stream->streaming_ctrl = streaming_ctrl_new(); | |
977 if( stream->streaming_ctrl==NULL ) { | |
978 return STREAM_ERROR; | |
979 } | |
980 stream->streaming_ctrl->bandwidth = network_bandwidth; | |
981 url = url_new(stream->url); | |
982 stream->streaming_ctrl->url = check4proxies(url); | |
16614 | 983 url_free(url); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
984 |
20185 | 985 mp_msg(MSGT_OPEN, MSGL_V, "STREAM_HTTP(2), URL: %s\n", stream->url); |
15585 | 986 seekable = http_streaming_start(stream, file_format); |
987 if(seekable < 0) { | |
21567 | 988 if (stream->fd >= 0) |
989 closesocket(stream->fd); | |
990 stream->fd = -1; | |
15585 | 991 streaming_ctrl_free(stream->streaming_ctrl); |
992 stream->streaming_ctrl = NULL; | |
24257 | 993 return STREAM_UNSUPPORTED; |
15585 | 994 } |
995 | |
996 return fixup_open(stream, seekable); | |
997 } | |
998 | |
999 | |
25211 | 1000 const stream_info_t stream_info_http1 = { |
15585 | 1001 "http streaming", |
1002 "null", | |
1003 "Bertrand, Albeau, Reimar Doeffinger, Arpi?", | |
1004 "plain http", | |
1005 open_s1, | |
27847
28deb37052cd
Add a noicyx:// protocol to allow easier testing for misconfigured servers.
reimar
parents:
27834
diff
changeset
|
1006 {"http", "http_proxy", "unsv", "icyx", "noicyx", NULL}, |
15585 | 1007 NULL, |
1008 0 // Urls are an option string | |
1009 }; | |
1010 | |
25211 | 1011 const stream_info_t stream_info_http2 = { |
15585 | 1012 "http streaming", |
1013 "null", | |
1014 "Bertrand, Albeu, Arpi? who?", | |
16932
c30e0970250c
fix typos: aslo->also, falback->fallback (they were just too annoying *g*)
reimar
parents:
16917
diff
changeset
|
1015 "plain http, also used as fallback for many other protocols", |
15585 | 1016 open_s2, |
1017 {"http", "http_proxy", "pnm", "mms", "mmsu", "mmst", "rtsp", NULL}, //all the others as fallback | |
1018 NULL, | |
1019 0 // Urls are an option string | |
1020 }; |