Mercurial > mplayer.hg
annotate stream/http.c @ 34764:9e81d9667789
Add Spanish entries to desktop file.
Translation by Juan A. Javierre, jjavierre telefonica net.
author | ib |
---|---|
date | Wed, 11 Apr 2012 18:44:02 +0000 |
parents | 9c695b52687e |
children | 06847bdbe4bc |
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 | |
32585 | 45 #include "libavutil/base64.h" |
15585 | 46 |
16013 | 47 typedef struct { |
48 unsigned metaint; | |
49 unsigned metapos; | |
50 int is_ultravox; | |
51 } scast_data_t; | |
52 | |
53 /** | |
54 * \brief first read any data from sc->buffer then from fd | |
55 * \param fd file descriptor to read data from | |
56 * \param buffer buffer to read into | |
57 * \param len how many bytes to read | |
58 * \param sc streaming control containing buffer to read from first | |
59 * \return len unless there is a read error or eof | |
60 */ | |
61 static unsigned my_read(int fd, char *buffer, int len, streaming_ctrl_t *sc) { | |
62 unsigned pos = 0; | |
63 unsigned cp_len = sc->buffer_size - sc->buffer_pos; | |
64 if (cp_len > len) | |
65 cp_len = len; | |
66 memcpy(buffer, &sc->buffer[sc->buffer_pos], cp_len); | |
67 sc->buffer_pos += cp_len; | |
68 pos += cp_len; | |
69 while (pos < len) { | |
16070 | 70 int ret = recv(fd, &buffer[pos], len - pos, 0); |
16013 | 71 if (ret <= 0) |
72 break; | |
73 pos += ret; | |
74 } | |
75 return pos; | |
76 } | |
77 | |
16032 | 78 /** |
79 * \brief read and process (i.e. discard *g*) a block of ultravox metadata | |
80 * \param fd file descriptor to read from | |
81 * \param sc streaming_ctrl_t whose buffer is consumed before reading from fd | |
82 * \return number of real data before next metadata block starts or 0 on error | |
34343 | 83 * |
84 * You can use unsv://samples.mplayerhq.hu/V-codecs/VP5/vp5_artefacts.nsv to | |
85 * test. | |
16032 | 86 */ |
16013 | 87 static unsigned uvox_meta_read(int fd, streaming_ctrl_t *sc) { |
88 unsigned metaint; | |
16070 | 89 unsigned char info[6] = {0, 0, 0, 0, 0, 0}; |
90 int info_read; | |
16013 | 91 do { |
16070 | 92 info_read = my_read(fd, info, 1, sc); |
16013 | 93 if (info[0] == 0x00) |
16070 | 94 info_read = my_read(fd, info, 6, sc); |
16013 | 95 else |
16070 | 96 info_read += my_read(fd, &info[1], 5, sc); |
97 if (info_read != 6) // read error or eof | |
98 return 0; | |
16031
c2e78215f0d9
Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents:
16013
diff
changeset
|
99 // sync byte and reserved flags |
c2e78215f0d9
Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents:
16013
diff
changeset
|
100 if (info[0] != 0x5a || (info[1] & 0xfc) != 0x00) { |
16013 | 101 mp_msg(MSGT_DEMUXER, MSGL_ERR, "Invalid or unknown uvox metadata\n"); |
102 return 0; | |
103 } | |
16031
c2e78215f0d9
Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents:
16013
diff
changeset
|
104 if (info[1] & 0x01) |
c2e78215f0d9
Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents:
16013
diff
changeset
|
105 mp_msg(MSGT_DEMUXER, MSGL_WARN, "Encrypted ultravox data\n"); |
16013 | 106 metaint = info[4] << 8 | info[5]; |
16031
c2e78215f0d9
Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents:
16013
diff
changeset
|
107 if ((info[3] & 0xf) < 0x07) { // discard any metadata nonsense |
16013 | 108 char *metabuf = malloc(metaint); |
109 my_read(fd, metabuf, metaint, sc); | |
110 free(metabuf); | |
111 } | |
16031
c2e78215f0d9
Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents:
16013
diff
changeset
|
112 } while ((info[3] & 0xf) < 0x07); |
16013 | 113 return metaint; |
114 } | |
115 | |
116 /** | |
117 * \brief read one scast meta data entry and print it | |
16032 | 118 * \param fd file descriptor to read from |
119 * \param sc streaming_ctrl_t whose buffer is consumed before reading from fd | |
16013 | 120 */ |
121 static void scast_meta_read(int fd, streaming_ctrl_t *sc) { | |
122 unsigned char tmp = 0; | |
123 unsigned metalen; | |
124 my_read(fd, &tmp, 1, sc); | |
125 metalen = tmp * 16; | |
126 if (metalen > 0) { | |
30938 | 127 int i; |
30941
fb3bde3ec3a8
Change type to uint8_t to avoid checks depending on char signedness.
reimar
parents:
30938
diff
changeset
|
128 uint8_t *info = malloc(metalen + 1); |
16013 | 129 unsigned nlen = my_read(fd, info, metalen, sc); |
30938 | 130 // avoid breaking the user's terminal too much |
131 if (nlen > 256) nlen = 256; | |
132 for (i = 0; i < nlen; i++) | |
133 if (info[i] && info[i] < 32) info[i] = '?'; | |
16013 | 134 info[nlen] = 0; |
135 mp_msg(MSGT_DEMUXER, MSGL_INFO, "\nICY Info: %s\n", info); | |
136 free(info); | |
137 } | |
138 } | |
139 | |
16032 | 140 /** |
141 * \brief read data from scast/ultravox stream without any metadata | |
142 * \param fd file descriptor to read from | |
143 * \param buffer buffer to read data into | |
144 * \param size number of bytes to read | |
145 * \param sc streaming_ctrl_t whose buffer is consumed before reading from fd | |
146 */ | |
16013 | 147 static int scast_streaming_read(int fd, char *buffer, int size, |
148 streaming_ctrl_t *sc) { | |
149 scast_data_t *sd = (scast_data_t *)sc->data; | |
150 unsigned block, ret; | |
151 unsigned done = 0; | |
152 | |
153 // first read remaining data up to next metadata | |
154 block = sd->metaint - sd->metapos; | |
155 if (block > size) | |
156 block = size; | |
157 ret = my_read(fd, buffer, block, sc); | |
158 sd->metapos += ret; | |
159 done += ret; | |
160 if (ret != block) // read problems or eof | |
161 size = done; | |
162 | |
163 while (done < size) { // now comes the metadata | |
164 if (sd->is_ultravox) | |
16070 | 165 { |
16013 | 166 sd->metaint = uvox_meta_read(fd, sc); |
16070 | 167 if (!sd->metaint) |
168 size = done; | |
169 } | |
16013 | 170 else |
171 scast_meta_read(fd, sc); // read and display metadata | |
172 sd->metapos = 0; | |
173 block = size - done; | |
174 if (block > sd->metaint) | |
175 block = sd->metaint; | |
176 ret = my_read(fd, &buffer[done], block, sc); | |
177 sd->metapos += ret; | |
178 done += ret; | |
179 if (ret != block) // read problems or eof | |
180 size = done; | |
181 } | |
182 return done; | |
183 } | |
184 | |
185 static int scast_streaming_start(stream_t *stream) { | |
186 int metaint; | |
187 scast_data_t *scast_data; | |
188 HTTP_header_t *http_hdr = stream->streaming_ctrl->data; | |
16070 | 189 int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0; |
16013 | 190 if (!stream || stream->fd < 0 || !http_hdr) |
191 return -1; | |
192 if (is_ultravox) | |
193 metaint = 0; | |
194 else { | |
195 metaint = atoi(http_get_field(http_hdr, "Icy-MetaInt")); | |
196 if (metaint <= 0) | |
197 return -1; | |
198 } | |
199 stream->streaming_ctrl->buffer = malloc(http_hdr->body_size); | |
200 stream->streaming_ctrl->buffer_size = http_hdr->body_size; | |
201 stream->streaming_ctrl->buffer_pos = 0; | |
202 memcpy(stream->streaming_ctrl->buffer, http_hdr->body, http_hdr->body_size); | |
203 scast_data = malloc(sizeof(scast_data_t)); | |
204 scast_data->metaint = metaint; | |
205 scast_data->metapos = 0; | |
206 scast_data->is_ultravox = is_ultravox; | |
207 http_free(http_hdr); | |
208 stream->streaming_ctrl->data = scast_data; | |
209 stream->streaming_ctrl->streaming_read = scast_streaming_read; | |
210 stream->streaming_ctrl->streaming_seek = NULL; | |
211 stream->streaming_ctrl->prebuffer_size = 64 * 1024; // 64 KBytes | |
212 stream->streaming_ctrl->buffering = 1; | |
213 stream->streaming_ctrl->status = streaming_playing_e; | |
214 return 0; | |
215 } | |
216 | |
15585 | 217 static int nop_streaming_start( stream_t *stream ) { |
218 HTTP_header_t *http_hdr = NULL; | |
219 char *next_url=NULL; | |
220 URL_t *rd_url=NULL; | |
221 int fd,ret; | |
222 if( stream==NULL ) return -1; | |
223 | |
224 fd = stream->fd; | |
225 if( fd<0 ) { | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
226 fd = http_send_request( stream->streaming_ctrl->url, 0 ); |
15585 | 227 if( fd<0 ) return -1; |
228 http_hdr = http_read_response( fd ); | |
229 if( http_hdr==NULL ) return -1; | |
230 | |
231 switch( http_hdr->status_code ) { | |
232 case 200: // OK | |
233 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") ); | |
234 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") ); | |
235 if( http_hdr->body_size>0 ) { | |
236 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { | |
237 http_free( http_hdr ); | |
238 return -1; | |
239 } | |
240 } | |
241 break; | |
242 // Redirect | |
243 case 301: // Permanently | |
244 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
|
245 case 303: // See Other |
32630
2653cb380532
Add support for HTTP 307 (Temporary Redirect) responses.
cboesch
parents:
32585
diff
changeset
|
246 case 307: // Temporarily (since HTTP/1.1) |
15585 | 247 ret=-1; |
248 next_url = http_get_field( http_hdr, "Location" ); | |
249 | |
250 if (next_url != NULL) | |
251 rd_url=url_new(next_url); | |
252 | |
253 if (next_url != NULL && rd_url != NULL) { | |
254 mp_msg(MSGT_NETWORK,MSGL_STATUS,"Redirected: Using this url instead %s\n",next_url); | |
255 stream->streaming_ctrl->url=check4proxies(rd_url); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
256 ret=nop_streaming_start(stream); //recursively get streaming started |
15585 | 257 } else { |
258 mp_msg(MSGT_NETWORK,MSGL_ERR,"Redirection failed\n"); | |
259 closesocket( fd ); | |
260 fd = -1; | |
261 } | |
262 return ret; | |
263 break; | |
264 case 401: //Authorization required | |
265 case 403: //Forbidden | |
266 case 404: //Not found | |
267 case 500: //Server Error | |
268 default: | |
269 mp_msg(MSGT_NETWORK,MSGL_ERR,"Server returned code %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); | |
270 closesocket( fd ); | |
271 fd = -1; | |
272 return -1; | |
273 break; | |
274 } | |
275 stream->fd = fd; | |
276 } else { | |
277 http_hdr = (HTTP_header_t*)stream->streaming_ctrl->data; | |
278 if( http_hdr->body_size>0 ) { | |
279 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { | |
280 http_free( http_hdr ); | |
281 stream->streaming_ctrl->data = NULL; | |
282 return -1; | |
283 } | |
284 } | |
285 } | |
286 | |
287 if( http_hdr ) { | |
288 http_free( http_hdr ); | |
289 stream->streaming_ctrl->data = NULL; | |
290 } | |
291 | |
292 stream->streaming_ctrl->streaming_read = nop_streaming_read; | |
293 stream->streaming_ctrl->streaming_seek = nop_streaming_seek; | |
294 stream->streaming_ctrl->prebuffer_size = 64*1024; // 64 KBytes | |
295 stream->streaming_ctrl->buffering = 1; | |
296 stream->streaming_ctrl->status = streaming_playing_e; | |
297 return 0; | |
298 } | |
299 | |
870 | 300 HTTP_header_t * |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
16948
diff
changeset
|
301 http_new_header(void) { |
870 | 302 HTTP_header_t *http_hdr; |
303 | |
32636 | 304 http_hdr = calloc(1, sizeof(*http_hdr)); |
870 | 305 if( http_hdr==NULL ) return NULL; |
306 | |
307 return http_hdr; | |
308 } | |
309 | |
310 void | |
311 http_free( HTTP_header_t *http_hdr ) { | |
3039 | 312 HTTP_field_t *field, *field2free; |
870 | 313 if( http_hdr==NULL ) return; |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
314 free(http_hdr->protocol); |
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
315 free(http_hdr->uri); |
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
316 free(http_hdr->reason_phrase); |
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
317 free(http_hdr->field_search); |
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
318 free(http_hdr->method); |
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
319 free(http_hdr->buffer); |
3039 | 320 field = http_hdr->first_field; |
321 while( field!=NULL ) { | |
322 field2free = field; | |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
323 free(field->field_name); |
3039 | 324 field = field->next; |
325 free( field2free ); | |
326 } | |
870 | 327 free( http_hdr ); |
3039 | 328 http_hdr = NULL; |
870 | 329 } |
330 | |
902 | 331 int |
332 http_response_append( HTTP_header_t *http_hdr, char *response, int length ) { | |
1027 | 333 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
|
334 |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18094
diff
changeset
|
335 if( (unsigned)length > SIZE_MAX - http_hdr->buffer_size - 1) { |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18094
diff
changeset
|
336 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
|
337 return -1; |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18094
diff
changeset
|
338 } |
30702 | 339 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
|
340 if( http_hdr->buffer==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
341 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
902 | 342 return -1; |
343 } | |
7293 | 344 memcpy( http_hdr->buffer+http_hdr->buffer_size, response, length ); |
345 http_hdr->buffer_size += length; | |
346 http_hdr->buffer[http_hdr->buffer_size]=0; // close the string! | |
902 | 347 return http_hdr->buffer_size; |
348 } | |
349 | |
350 int | |
2489
0ecc1b4f7cf8
Added ASF http server streaming (Not mms streaming).
bertrand
parents:
2310
diff
changeset
|
351 http_is_header_entire( HTTP_header_t *http_hdr ) { |
902 | 352 if( http_hdr==NULL ) return -1; |
7293 | 353 if( http_hdr->buffer==NULL ) return 0; // empty |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
354 |
3784 | 355 if( strstr(http_hdr->buffer, "\r\n\r\n")==NULL && |
356 strstr(http_hdr->buffer, "\n\n")==NULL ) return 0; | |
357 return 1; | |
902 | 358 } |
359 | |
360 int | |
361 http_response_parse( HTTP_header_t *http_hdr ) { | |
870 | 362 char *hdr_ptr, *ptr; |
363 char *field=NULL; | |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18094
diff
changeset
|
364 int pos_hdr_sep, hdr_sep_len; |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18094
diff
changeset
|
365 size_t len; |
902 | 366 if( http_hdr==NULL ) return -1; |
367 if( http_hdr->is_parsed ) return 0; | |
870 | 368 |
369 // Get the protocol | |
902 | 370 hdr_ptr = strstr( http_hdr->buffer, " " ); |
870 | 371 if( hdr_ptr==NULL ) { |
5915 | 372 mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. No space separator found.\n"); |
902 | 373 return -1; |
870 | 374 } |
902 | 375 len = hdr_ptr-http_hdr->buffer; |
18879 | 376 http_hdr->protocol = malloc(len+1); |
870 | 377 if( http_hdr->protocol==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
378 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
902 | 379 return -1; |
870 | 380 } |
902 | 381 strncpy( http_hdr->protocol, http_hdr->buffer, len ); |
382 http_hdr->protocol[len]='\0'; | |
870 | 383 if( !strncasecmp( http_hdr->protocol, "HTTP", 4) ) { |
384 if( sscanf( http_hdr->protocol+5,"1.%d", &(http_hdr->http_minor_version) )!=1 ) { | |
5915 | 385 mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. Unable to get HTTP minor version.\n"); |
902 | 386 return -1; |
870 | 387 } |
388 } | |
389 | |
390 // Get the status code | |
391 if( sscanf( ++hdr_ptr, "%d", &(http_hdr->status_code) )!=1 ) { | |
5915 | 392 mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. Unable to get status code.\n"); |
902 | 393 return -1; |
870 | 394 } |
395 hdr_ptr += 4; | |
396 | |
397 // Get the reason phrase | |
3514
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
398 ptr = strstr( hdr_ptr, "\n" ); |
870 | 399 if( hdr_ptr==NULL ) { |
5915 | 400 mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. Unable to get the reason phrase.\n"); |
902 | 401 return -1; |
870 | 402 } |
403 len = ptr-hdr_ptr; | |
18879 | 404 http_hdr->reason_phrase = malloc(len+1); |
870 | 405 if( http_hdr->reason_phrase==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
406 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
902 | 407 return -1; |
870 | 408 } |
409 strncpy( http_hdr->reason_phrase, hdr_ptr, len ); | |
4311 | 410 if( http_hdr->reason_phrase[len-1]=='\r' ) { |
411 len--; | |
412 } | |
870 | 413 http_hdr->reason_phrase[len]='\0'; |
414 | |
415 // 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
|
416 hdr_sep_len = 4; |
902 | 417 ptr = strstr( http_hdr->buffer, "\r\n\r\n" ); |
870 | 418 if( ptr==NULL ) { |
3514
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
419 ptr = strstr( http_hdr->buffer, "\n\n" ); |
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
420 if( ptr==NULL ) { |
5915 | 421 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
|
422 return -1; |
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
423 } |
8179
63a5e03f4346
Removed hard coded value for the length of the header separator.
bertrand
parents:
7304
diff
changeset
|
424 hdr_sep_len = 2; |
870 | 425 } |
902 | 426 pos_hdr_sep = ptr-http_hdr->buffer; |
870 | 427 |
3514
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
428 // 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
|
429 hdr_ptr = strstr( http_hdr->buffer, "\n" )+1; |
870 | 430 do { |
3514
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
431 ptr = hdr_ptr; |
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
432 while( *ptr!='\r' && *ptr!='\n' ) ptr++; |
870 | 433 len = ptr-hdr_ptr; |
4816
f1dea39a50bb
Fixed the http response parser when the http header only has the HTTP
bertrand
parents:
4311
diff
changeset
|
434 if( len==0 ) break; |
30702 | 435 field = realloc(field, len+1); |
870 | 436 if( field==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
437 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MemAllocFailed); |
902 | 438 return -1; |
870 | 439 } |
440 strncpy( field, hdr_ptr, len ); | |
441 field[len]='\0'; | |
442 http_set_field( http_hdr, field ); | |
3514
43518985def8
Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents:
3497
diff
changeset
|
443 hdr_ptr = ptr+((*ptr=='\r')?2:1); |
902 | 444 } while( hdr_ptr<(http_hdr->buffer+pos_hdr_sep) ); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
445 |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
446 free(field); |
870 | 447 |
8179
63a5e03f4346
Removed hard coded value for the length of the header separator.
bertrand
parents:
7304
diff
changeset
|
448 if( pos_hdr_sep+hdr_sep_len<http_hdr->buffer_size ) { |
870 | 449 // Response has data! |
8179
63a5e03f4346
Removed hard coded value for the length of the header separator.
bertrand
parents:
7304
diff
changeset
|
450 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
|
451 http_hdr->body_size = http_hdr->buffer_size-(pos_hdr_sep+hdr_sep_len); |
870 | 452 } |
453 | |
902 | 454 http_hdr->is_parsed = 1; |
455 return 0; | |
870 | 456 } |
457 | |
458 char * | |
902 | 459 http_build_request( HTTP_header_t *http_hdr ) { |
3497 | 460 char *ptr, *uri=NULL; |
902 | 461 int len; |
3039 | 462 HTTP_field_t *field; |
870 | 463 if( http_hdr==NULL ) return NULL; |
464 | |
465 if( http_hdr->method==NULL ) http_set_method( http_hdr, "GET"); | |
466 if( http_hdr->uri==NULL ) http_set_uri( http_hdr, "/"); | |
3497 | 467 else { |
18879 | 468 uri = malloc(strlen(http_hdr->uri) + 1); |
3497 | 469 if( uri==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
470 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MemAllocFailed); |
3497 | 471 return NULL; |
472 } | |
12391 | 473 strcpy(uri,http_hdr->uri); |
3497 | 474 } |
870 | 475 |
3497 | 476 //**** Compute the request length |
477 // Add the Method line | |
478 len = strlen(http_hdr->method)+strlen(uri)+12; | |
479 // Add the fields | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
480 field = http_hdr->first_field; |
3039 | 481 while( field!=NULL ) { |
482 len += strlen(field->field_name)+2; | |
483 field = field->next; | |
484 } | |
3497 | 485 // Add the CRLF |
486 len += 2; | |
487 // Add the body | |
902 | 488 if( http_hdr->body!=NULL ) { |
489 len += http_hdr->body_size; | |
490 } | |
3497 | 491 // Free the buffer if it was previously used |
902 | 492 if( http_hdr->buffer!=NULL ) { |
493 free( http_hdr->buffer ); | |
494 http_hdr->buffer = NULL; | |
495 } | |
18879 | 496 http_hdr->buffer = malloc(len+1); |
902 | 497 if( http_hdr->buffer==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
498 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MemAllocFailed); |
902 | 499 return NULL; |
500 } | |
501 http_hdr->buffer_size = len; | |
502 | |
3497 | 503 //*** Building the request |
902 | 504 ptr = http_hdr->buffer; |
3497 | 505 // Add the method line |
506 ptr += sprintf( ptr, "%s %s HTTP/1.%d\r\n", http_hdr->method, uri, http_hdr->http_minor_version ); | |
3039 | 507 field = http_hdr->first_field; |
3497 | 508 // Add the field |
3039 | 509 while( field!=NULL ) { |
510 ptr += sprintf( ptr, "%s\r\n", field->field_name ); | |
511 field = field->next; | |
512 } | |
870 | 513 ptr += sprintf( ptr, "\r\n" ); |
3497 | 514 // Add the body |
870 | 515 if( http_hdr->body!=NULL ) { |
516 memcpy( ptr, http_hdr->body, http_hdr->body_size ); | |
517 } | |
3497 | 518 |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32052
diff
changeset
|
519 free(uri); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
520 return http_hdr->buffer; |
870 | 521 } |
522 | |
523 char * | |
524 http_get_field( HTTP_header_t *http_hdr, const char *field_name ) { | |
525 if( http_hdr==NULL || field_name==NULL ) return NULL; | |
3039 | 526 http_hdr->field_search_pos = http_hdr->first_field; |
30702 | 527 http_hdr->field_search = realloc( http_hdr->field_search, strlen(field_name)+1 ); |
870 | 528 if( http_hdr->field_search==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
529 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
870 | 530 return NULL; |
531 } | |
532 strcpy( http_hdr->field_search, field_name ); | |
533 return http_get_next_field( http_hdr ); | |
534 } | |
535 | |
536 char * | |
537 http_get_next_field( HTTP_header_t *http_hdr ) { | |
538 char *ptr; | |
3039 | 539 HTTP_field_t *field; |
870 | 540 if( http_hdr==NULL ) return NULL; |
541 | |
3039 | 542 field = http_hdr->field_search_pos; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
543 while( field!=NULL ) { |
3039 | 544 ptr = strstr( field->field_name, ":" ); |
870 | 545 if( ptr==NULL ) return NULL; |
3039 | 546 if( !strncasecmp( field->field_name, http_hdr->field_search, ptr-(field->field_name) ) ) { |
870 | 547 ptr++; // Skip the column |
548 while( ptr[0]==' ' ) ptr++; // Skip the spaces if there is some | |
3039 | 549 http_hdr->field_search_pos = field->next; |
870 | 550 return ptr; // return the value without the field name |
551 } | |
3039 | 552 field = field->next; |
870 | 553 } |
554 return NULL; | |
555 } | |
556 | |
557 void | |
3039 | 558 http_set_field( HTTP_header_t *http_hdr, const char *field_name ) { |
559 HTTP_field_t *new_field; | |
560 if( http_hdr==NULL || field_name==NULL ) return; | |
870 | 561 |
18879 | 562 new_field = malloc(sizeof(HTTP_field_t)); |
3039 | 563 if( new_field==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
564 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
870 | 565 return; |
566 } | |
3039 | 567 new_field->next = NULL; |
18879 | 568 new_field->field_name = malloc(strlen(field_name)+1); |
3039 | 569 if( new_field->field_name==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
570 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
|
571 free(new_field); |
3039 | 572 return; |
573 } | |
574 strcpy( new_field->field_name, field_name ); | |
575 | |
576 if( http_hdr->last_field==NULL ) { | |
577 http_hdr->first_field = new_field; | |
578 } else { | |
579 http_hdr->last_field->next = new_field; | |
580 } | |
581 http_hdr->last_field = new_field; | |
870 | 582 http_hdr->field_nb++; |
583 } | |
584 | |
585 void | |
586 http_set_method( HTTP_header_t *http_hdr, const char *method ) { | |
587 if( http_hdr==NULL || method==NULL ) return; | |
588 | |
18879 | 589 http_hdr->method = malloc(strlen(method)+1); |
870 | 590 if( http_hdr->method==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
591 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
870 | 592 return; |
593 } | |
594 strcpy( http_hdr->method, method ); | |
595 } | |
596 | |
597 void | |
598 http_set_uri( HTTP_header_t *http_hdr, const char *uri ) { | |
599 if( http_hdr==NULL || uri==NULL ) return; | |
600 | |
18879 | 601 http_hdr->uri = malloc(strlen(uri)+1); |
870 | 602 if( http_hdr->uri==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
603 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
870 | 604 return; |
605 } | |
606 strcpy( http_hdr->uri, uri ); | |
607 } | |
608 | |
32547
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
609 static int |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
610 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
|
611 char *auth = NULL, *usr_pass = NULL, *b64_usr_pass = NULL; |
32585 | 612 int encoded_len, pass_len=0; |
613 size_t auth_len, usr_pass_len; | |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
614 int res = -1; |
6514 | 615 if( http_hdr==NULL || username==NULL ) return -1; |
616 | |
617 if( password!=NULL ) { | |
618 pass_len = strlen(password); | |
619 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
620 |
32585 | 621 usr_pass_len = strlen(username) + 1 + pass_len; |
622 usr_pass = malloc(usr_pass_len + 1); | |
6514 | 623 if( usr_pass==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
624 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
625 goto out; |
6514 | 626 } |
627 | |
628 sprintf( usr_pass, "%s:%s", username, (password==NULL)?"":password ); | |
629 | |
32585 | 630 encoded_len = AV_BASE64_SIZE(usr_pass_len); |
18879 | 631 b64_usr_pass = malloc(encoded_len); |
6514 | 632 if( b64_usr_pass==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
633 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
634 goto out; |
6514 | 635 } |
32585 | 636 av_base64_encode(b64_usr_pass, encoded_len, usr_pass, usr_pass_len); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
637 |
32547
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
638 auth_len = encoded_len + 100; |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
639 auth = malloc(auth_len); |
6514 | 640 if( auth==NULL ) { |
32515
84bdbf9e9c48
Use MSGTR_MemAllocFailed instead of hardcoded string
cboesch
parents:
32511
diff
changeset
|
641 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
642 goto out; |
6514 | 643 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
644 |
32547
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
645 snprintf(auth, auth_len, "%s: Basic %s", auth_str, b64_usr_pass); |
6514 | 646 http_set_field( http_hdr, auth ); |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
647 res = 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
648 |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
649 out: |
6514 | 650 free( usr_pass ); |
651 free( b64_usr_pass ); | |
652 free( auth ); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
653 |
18094
16f2bcd5d148
free memory on error in http_add_basic_authentication
reimar
parents:
17932
diff
changeset
|
654 return res; |
6514 | 655 } |
656 | |
32547
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
657 int |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
658 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
|
659 return http_add_authentication(http_hdr, username, password, "Authorization"); |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
660 } |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
661 |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
662 int |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
663 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
|
664 return http_add_authentication(http_hdr, username, password, "Proxy-Authorization"); |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
665 } |
6a629e6fdb09
Add Proxy-Authorization header to authenticate on proxies
cboesch
parents:
32515
diff
changeset
|
666 |
870 | 667 void |
668 http_debug_hdr( HTTP_header_t *http_hdr ) { | |
3039 | 669 HTTP_field_t *field; |
670 int i = 0; | |
902 | 671 if( http_hdr==NULL ) return; |
870 | 672 |
5915 | 673 mp_msg(MSGT_NETWORK,MSGL_V,"--- HTTP DEBUG HEADER --- START ---\n"); |
674 mp_msg(MSGT_NETWORK,MSGL_V,"protocol: [%s]\n", http_hdr->protocol ); | |
675 mp_msg(MSGT_NETWORK,MSGL_V,"http minor version: [%d]\n", http_hdr->http_minor_version ); | |
676 mp_msg(MSGT_NETWORK,MSGL_V,"uri: [%s]\n", http_hdr->uri ); | |
677 mp_msg(MSGT_NETWORK,MSGL_V,"method: [%s]\n", http_hdr->method ); | |
678 mp_msg(MSGT_NETWORK,MSGL_V,"status code: [%d]\n", http_hdr->status_code ); | |
679 mp_msg(MSGT_NETWORK,MSGL_V,"reason phrase: [%s]\n", http_hdr->reason_phrase ); | |
33841
25667edae85c
cleanup: adjust printf format strings to match parameter types
diego
parents:
32720
diff
changeset
|
680 mp_msg(MSGT_NETWORK,MSGL_V,"body size: [%zu]\n", http_hdr->body_size ); |
870 | 681 |
5915 | 682 mp_msg(MSGT_NETWORK,MSGL_V,"Fields:\n"); |
3039 | 683 field = http_hdr->first_field; |
684 while( field!=NULL ) { | |
5915 | 685 mp_msg(MSGT_NETWORK,MSGL_V," %d - %s\n", i++, field->field_name ); |
3039 | 686 field = field->next; |
687 } | |
5915 | 688 mp_msg(MSGT_NETWORK,MSGL_V,"--- HTTP DEBUG HEADER --- END ---\n"); |
870 | 689 } |
6514 | 690 |
25970
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
691 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
|
692 const char *field_data; |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
693 // 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
|
694 // and are IMHO useless info ::atmos |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
695 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
|
696 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
|
697 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
|
698 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
|
699 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
|
700 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
|
701 // XXX: does this really mean public server? ::atmos |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
702 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
|
703 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
|
704 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
|
705 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
|
706 } |
c6ec51cc3b13
Move printing of Icy-Metadata into an extra function
reimar
parents:
25969
diff
changeset
|
707 |
21567 | 708 //! If this function succeeds you must closesocket stream->fd |
15585 | 709 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
|
710 HTTP_header_t *http_hdr = NULL; |
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
711 int fd = stream->fd; |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
712 int res = STREAM_UNSUPPORTED; |
15585 | 713 int redirect = 0; |
714 int auth_retry=0; | |
715 int seekable=0; | |
716 char *content_type; | |
30357
3fdf04500df2
Handle Content-Length also when Content-Type is not set.
reimar
parents:
30356
diff
changeset
|
717 const char *content_length; |
15585 | 718 char *next_url; |
719 URL_t *url = stream->streaming_ctrl->url; | |
6514 | 720 |
15585 | 721 do |
722 { | |
21541
3b4ed8857b38
Fix potential endless loop in http_streaming_start due
reimar
parents:
21540
diff
changeset
|
723 redirect = 0; |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
724 if (fd > 0) closesocket(fd); |
15585 | 725 fd = http_send_request( url, 0 ); |
726 if( fd<0 ) { | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
727 goto err_out; |
15585 | 728 } |
729 | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
730 http_free(http_hdr); |
15585 | 731 http_hdr = http_read_response( fd ); |
732 if( http_hdr==NULL ) { | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
733 goto err_out; |
15585 | 734 } |
735 | |
17932 | 736 if( mp_msg_test(MSGT_NETWORK,MSGL_V) ) { |
15585 | 737 http_debug_hdr( http_hdr ); |
738 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
739 |
15585 | 740 // Check if we can make partial content requests and thus seek in http-streams |
741 if( http_hdr!=NULL && http_hdr->status_code==200 ) { | |
30106 | 742 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
|
743 const char *server = http_get_field(http_hdr, "Server"); |
30106 | 744 if (accept_ranges) |
15585 | 745 seekable = strncmp(accept_ranges,"bytes",5)==0; |
32720
1afbc8e3ff55
100l, fix hack to check for MakeMKV server being inverted.
reimar
parents:
32698
diff
changeset
|
746 else if (server && (strcmp(server, "gvs 1.0") == 0 || |
1afbc8e3ff55
100l, fix hack to check for MakeMKV server being inverted.
reimar
parents:
32698
diff
changeset
|
747 strncmp(server, "MakeMKV", 7) == 0)) { |
32698
b171c744cd06
Add MakeMKV to list of webservers always supporting ranges even when they
reimar
parents:
32636
diff
changeset
|
748 // HACK for youtube and MakeMKV incorrectly claiming not to support seeking |
b171c744cd06
Add MakeMKV to list of webservers always supporting ranges even when they
reimar
parents:
32636
diff
changeset
|
749 mp_msg(MSGT_NETWORK, MSGL_WARN, "Broken webserver, incorrectly claims to not support Accept-Ranges\n"); |
b171c744cd06
Add MakeMKV to list of webservers always supporting ranges even when they
reimar
parents:
32636
diff
changeset
|
750 seekable = 1; |
b171c744cd06
Add MakeMKV to list of webservers always supporting ranges even when they
reimar
parents:
32636
diff
changeset
|
751 } |
15585 | 752 } |
753 | |
25971
64b1e4ea04fc
Always display Icy-Metadata if available, whether we recognize an ICY-Server
reimar
parents:
25970
diff
changeset
|
754 print_icy_metadata(http_hdr); |
64b1e4ea04fc
Always display Icy-Metadata if available, whether we recognize an ICY-Server
reimar
parents:
25970
diff
changeset
|
755 |
15585 | 756 // 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
|
757 if( !strcasecmp(http_hdr->protocol, "ICY") || |
c7f41f9e2eb8
Detect IceCast also by Icy-MetaInt header part in http_streaming_start(),
reimar
parents:
25246
diff
changeset
|
758 http_get_field(http_hdr, "Icy-MetaInt") ) { |
15585 | 759 switch( http_hdr->status_code ) { |
760 case 200: { // OK | |
25969 | 761 char *field_data; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
762 // 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
|
763 // otherwise it should be mp3. if there are more types consider adding mime type |
15585 | 764 // handling like later |
765 if ( (field_data = http_get_field(http_hdr, "content-type")) != NULL && (!strcmp(field_data, "video/nsv") || !strcmp(field_data, "misc/ultravox"))) | |
766 *file_format = DEMUXER_TYPE_NSV; | |
16948
9b7925705f5b
Add another content-type for aac audio in shoutcast streams
rtognimp
parents:
16932
diff
changeset
|
767 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
|
768 *file_format = DEMUXER_TYPE_AAC; |
15585 | 769 else |
770 *file_format = DEMUXER_TYPE_AUDIO; | |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
771 res = STREAM_ERROR; |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
772 goto out; |
15585 | 773 } |
774 case 400: // Server Full | |
775 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
|
776 goto err_out; |
15585 | 777 case 401: // Service Unavailable |
778 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
|
779 goto err_out; |
15585 | 780 case 403: // Service Forbidden |
781 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
|
782 goto err_out; |
15585 | 783 case 404: // Resource Not Found |
784 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
|
785 goto err_out; |
15585 | 786 default: |
787 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
|
788 goto err_out; |
15585 | 789 } |
790 } | |
791 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
792 // Assume standard http if not ICY |
15585 | 793 switch( http_hdr->status_code ) { |
794 case 200: // OK | |
30357
3fdf04500df2
Handle Content-Length also when Content-Type is not set.
reimar
parents:
30356
diff
changeset
|
795 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
|
796 if (content_length) { |
3fdf04500df2
Handle Content-Length also when Content-Type is not set.
reimar
parents:
30356
diff
changeset
|
797 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
|
798 stream->end_pos = atoll(content_length); |
3fdf04500df2
Handle Content-Length also when Content-Type is not set.
reimar
parents:
30356
diff
changeset
|
799 } |
15585 | 800 // Look if we can use the Content-Type |
801 content_type = http_get_field( http_hdr, "Content-Type" ); | |
802 if( content_type!=NULL ) { | |
32557 | 803 unsigned int i; |
804 | |
15585 | 805 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", content_type ); |
806 // Check in the mime type table for a demuxer type | |
32557 | 807 for (i = 0; mime_type_table[i].mime_type != NULL; i++) { |
15585 | 808 if( !strcasecmp( content_type, mime_type_table[i].mime_type ) ) { |
809 *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
|
810 res = seekable; |
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
811 goto out; |
15585 | 812 } |
813 } | |
814 } | |
815 // Not found in the mime type table, don't fail, | |
816 // 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
|
817 res = seekable; |
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
818 goto out; |
15585 | 819 // Redirect |
820 case 301: // Permanently | |
821 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
|
822 case 303: // See Other |
32630
2653cb380532
Add support for HTTP 307 (Temporary Redirect) responses.
cboesch
parents:
32585
diff
changeset
|
823 case 307: // Temporarily (since HTTP/1.1) |
15585 | 824 // TODO: RFC 2616, recommand to detect infinite redirection loops |
825 next_url = http_get_field( http_hdr, "Location" ); | |
826 if( next_url!=NULL ) { | |
25238
f42b8e689416
Preserve unsv:// protocol specifier over http redirects.
reimar
parents:
25211
diff
changeset
|
827 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
|
828 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
|
829 if (!strcasecmp(url->protocol, "mms")) { |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
830 res = STREAM_REDIRECTED; |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
831 goto err_out; |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
832 } |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
833 if (strcasecmp(url->protocol, "http")) { |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
834 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
|
835 goto err_out; |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
836 } |
25238
f42b8e689416
Preserve unsv:// protocol specifier over http redirects.
reimar
parents:
25211
diff
changeset
|
837 if (is_ultravox) { |
f42b8e689416
Preserve unsv:// protocol specifier over http redirects.
reimar
parents:
25211
diff
changeset
|
838 free(url->protocol); |
f42b8e689416
Preserve unsv:// protocol specifier over http redirects.
reimar
parents:
25211
diff
changeset
|
839 url->protocol = strdup("unsv"); |
f42b8e689416
Preserve unsv:// protocol specifier over http redirects.
reimar
parents:
25211
diff
changeset
|
840 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
841 redirect = 1; |
15585 | 842 } |
843 break; | |
844 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
|
845 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
|
846 goto err_out; |
15585 | 847 redirect = 1; |
848 break; | |
849 default: | |
850 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
|
851 goto err_out; |
15585 | 852 } |
853 } while( redirect ); | |
854 | |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
855 err_out: |
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
856 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
|
857 fd = -1; |
21542 | 858 http_free( http_hdr ); |
21776 | 859 http_hdr = NULL; |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
860 out: |
21776 | 861 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
|
862 stream->fd = fd; |
21540
147c1c305f21
Fix lots and lots of potential memory/fd leaks in http_streaming_start
reimar
parents:
20784
diff
changeset
|
863 return res; |
15585 | 864 } |
865 | |
866 static int fixup_open(stream_t *stream,int seekable) { | |
16013 | 867 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
|
868 int is_icy = http_hdr && http_get_field(http_hdr, "Icy-MetaInt"); |
16070 | 869 int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0; |
15585 | 870 |
871 stream->type = STREAMTYPE_STREAM; | |
16013 | 872 if(!is_icy && !is_ultravox && seekable) |
15585 | 873 { |
29920
4f740437ed2b
Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents:
29263
diff
changeset
|
874 stream->flags |= MP_STREAM_SEEK; |
15585 | 875 stream->seek = http_seek; |
876 } | |
877 stream->streaming_ctrl->bandwidth = network_bandwidth; | |
16013 | 878 if ((!is_icy && !is_ultravox) || scast_streaming_start(stream)) |
15585 | 879 if(nop_streaming_start( stream )) { |
880 mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_start failed\n"); | |
21567 | 881 if (stream->fd >= 0) |
882 closesocket(stream->fd); | |
883 stream->fd = -1; | |
15585 | 884 streaming_ctrl_free(stream->streaming_ctrl); |
885 stream->streaming_ctrl = NULL; | |
24257 | 886 return STREAM_UNSUPPORTED; |
15585 | 887 } |
888 | |
889 fixup_network_stream_cache(stream); | |
890 return STREAM_OK; | |
891 } | |
892 | |
893 static int open_s1(stream_t *stream,int mode, void* opts, int* file_format) { | |
894 int seekable=0; | |
895 URL_t *url; | |
896 | |
897 stream->streaming_ctrl = streaming_ctrl_new(); | |
898 if( stream->streaming_ctrl==NULL ) { | |
899 return STREAM_ERROR; | |
900 } | |
901 stream->streaming_ctrl->bandwidth = network_bandwidth; | |
902 url = url_new(stream->url); | |
903 stream->streaming_ctrl->url = check4proxies(url); | |
16417 | 904 url_free(url); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
905 |
20185 | 906 mp_msg(MSGT_OPEN, MSGL_V, "STREAM_HTTP(1), URL: %s\n", stream->url); |
15585 | 907 seekable = http_streaming_start(stream, file_format); |
908 if((seekable < 0) || (*file_format == DEMUXER_TYPE_ASF)) { | |
21567 | 909 if (stream->fd >= 0) |
910 closesocket(stream->fd); | |
911 stream->fd = -1; | |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
912 if (seekable == STREAM_REDIRECTED) |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24257
diff
changeset
|
913 return seekable; |
15585 | 914 streaming_ctrl_free(stream->streaming_ctrl); |
915 stream->streaming_ctrl = NULL; | |
24257 | 916 return STREAM_UNSUPPORTED; |
15585 | 917 } |
918 | |
919 return fixup_open(stream, seekable); | |
920 } | |
921 | |
922 static int open_s2(stream_t *stream,int mode, void* opts, int* file_format) { | |
923 int seekable=0; | |
924 URL_t *url; | |
925 | |
926 stream->streaming_ctrl = streaming_ctrl_new(); | |
927 if( stream->streaming_ctrl==NULL ) { | |
928 return STREAM_ERROR; | |
929 } | |
930 stream->streaming_ctrl->bandwidth = network_bandwidth; | |
931 url = url_new(stream->url); | |
932 stream->streaming_ctrl->url = check4proxies(url); | |
16614 | 933 url_free(url); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
934 |
20185 | 935 mp_msg(MSGT_OPEN, MSGL_V, "STREAM_HTTP(2), URL: %s\n", stream->url); |
15585 | 936 seekable = http_streaming_start(stream, file_format); |
937 if(seekable < 0) { | |
21567 | 938 if (stream->fd >= 0) |
939 closesocket(stream->fd); | |
940 stream->fd = -1; | |
15585 | 941 streaming_ctrl_free(stream->streaming_ctrl); |
942 stream->streaming_ctrl = NULL; | |
24257 | 943 return STREAM_UNSUPPORTED; |
15585 | 944 } |
945 | |
946 return fixup_open(stream, seekable); | |
947 } | |
948 | |
949 | |
25211 | 950 const stream_info_t stream_info_http1 = { |
15585 | 951 "http streaming", |
952 "null", | |
953 "Bertrand, Albeau, Reimar Doeffinger, Arpi?", | |
954 "plain http", | |
955 open_s1, | |
27847
28deb37052cd
Add a noicyx:// protocol to allow easier testing for misconfigured servers.
reimar
parents:
27834
diff
changeset
|
956 {"http", "http_proxy", "unsv", "icyx", "noicyx", NULL}, |
15585 | 957 NULL, |
958 0 // Urls are an option string | |
959 }; | |
960 | |
25211 | 961 const stream_info_t stream_info_http2 = { |
15585 | 962 "http streaming", |
963 "null", | |
964 "Bertrand, Albeu, Arpi? who?", | |
16932
c30e0970250c
fix typos: aslo->also, falback->fallback (they were just too annoying *g*)
reimar
parents:
16917
diff
changeset
|
965 "plain http, also used as fallback for many other protocols", |
15585 | 966 open_s2, |
967 {"http", "http_proxy", "pnm", "mms", "mmsu", "mmst", "rtsp", NULL}, //all the others as fallback | |
968 NULL, | |
969 0 // Urls are an option string | |
970 }; |