annotate libmpdemux/http.c @ 18150:710d4bc5f8c9

Using channel count, samplerate and input bps values from the container instead of the decoder breaks some DTS samples where the container says the audio has 6 channels but the decoder gives 2. In this case take the number of channels from the decoder instead, the output will almost certainly be badly garbled anyway if the number of channels is wrong. patch by Uoti Urpala, uoti <<.>> urpala <<@>> pp1 <<.>> inet <<.>> fi
author diego
date Wed, 19 Apr 2006 20:12:01 +0000
parents 16f2bcd5d148
children 4928dd61f136
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
1 /*
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
2 * HTTP Helper
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
3 * by Bertrand Baudet <bertrand_baudet@yahoo.com>
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
4 * (C) 2001, MPlayer team.
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
5 */
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
6
15614
a4a46131ee71 Change header order to avoid compile error because of STREAM_SEEK
reimar
parents: 15585
diff changeset
7 #include "config.h"
a4a46131ee71 Change header order to avoid compile error because of STREAM_SEEK
reimar
parents: 15585
diff changeset
8
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
9 #include <stdio.h>
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
10 #include <stdlib.h>
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
11 #include <string.h>
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
12 #include <unistd.h>
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
13
15614
a4a46131ee71 Change header order to avoid compile error because of STREAM_SEEK
reimar
parents: 15585
diff changeset
14 #ifndef HAVE_WINSOCK2
a4a46131ee71 Change header order to avoid compile error because of STREAM_SEEK
reimar
parents: 15585
diff changeset
15 #define closesocket close
a4a46131ee71 Change header order to avoid compile error because of STREAM_SEEK
reimar
parents: 15585
diff changeset
16 #else
a4a46131ee71 Change header order to avoid compile error because of STREAM_SEEK
reimar
parents: 15585
diff changeset
17 #include <winsock2.h>
a4a46131ee71 Change header order to avoid compile error because of STREAM_SEEK
reimar
parents: 15585
diff changeset
18 #include <ws2tcpip.h>
a4a46131ee71 Change header order to avoid compile error because of STREAM_SEEK
reimar
parents: 15585
diff changeset
19 #endif
a4a46131ee71 Change header order to avoid compile error because of STREAM_SEEK
reimar
parents: 15585
diff changeset
20
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
21 #include "http.h"
4816
f1dea39a50bb Fixed the http response parser when the http header only has the HTTP
bertrand
parents: 4311
diff changeset
22 #include "url.h"
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
23 #include "mp_msg.h"
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
24
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
25 #include "stream.h"
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
26 #include "demuxer.h"
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
27 #include "network.h"
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
28 #include "help_mp.h"
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
29
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
30
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
31 extern mime_struct_t mime_type_table[];
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
32 extern int stream_cache_size;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
33 extern int network_bandwidth;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
34
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
35 extern int http_seek(stream_t *stream, off_t pos);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
36
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
37 typedef struct {
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
38 unsigned metaint;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
39 unsigned metapos;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
40 int is_ultravox;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
41 } scast_data_t;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
42
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
43 /**
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
44 * \brief first read any data from sc->buffer then from fd
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
45 * \param fd file descriptor to read data from
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
46 * \param buffer buffer to read into
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
47 * \param len how many bytes to read
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
48 * \param sc streaming control containing buffer to read from first
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
49 * \return len unless there is a read error or eof
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
50 */
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
51 static unsigned my_read(int fd, char *buffer, int len, streaming_ctrl_t *sc) {
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
52 unsigned pos = 0;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
53 unsigned cp_len = sc->buffer_size - sc->buffer_pos;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
54 if (cp_len > len)
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
55 cp_len = len;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
56 memcpy(buffer, &sc->buffer[sc->buffer_pos], cp_len);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
57 sc->buffer_pos += cp_len;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
58 pos += cp_len;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
59 while (pos < len) {
16070
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
60 int ret = recv(fd, &buffer[pos], len - pos, 0);
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
61 if (ret <= 0)
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
62 break;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
63 pos += ret;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
64 }
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
65 return pos;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
66 }
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
67
16032
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
68 /**
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
69 * \brief read and process (i.e. discard *g*) a block of ultravox metadata
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
70 * \param fd file descriptor to read from
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
71 * \param sc streaming_ctrl_t whose buffer is consumed before reading from fd
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
72 * \return number of real data before next metadata block starts or 0 on error
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
73 */
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
74 static unsigned uvox_meta_read(int fd, streaming_ctrl_t *sc) {
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
75 unsigned metaint;
16070
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
76 unsigned char info[6] = {0, 0, 0, 0, 0, 0};
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
77 int info_read;
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
78 do {
16070
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
79 info_read = my_read(fd, info, 1, sc);
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
80 if (info[0] == 0x00)
16070
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
81 info_read = my_read(fd, info, 6, sc);
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
82 else
16070
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
83 info_read += my_read(fd, &info[1], 5, sc);
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
84 if (info_read != 6) // read error or eof
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
85 return 0;
16031
c2e78215f0d9 Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents: 16013
diff changeset
86 // sync byte and reserved flags
c2e78215f0d9 Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents: 16013
diff changeset
87 if (info[0] != 0x5a || (info[1] & 0xfc) != 0x00) {
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
88 mp_msg(MSGT_DEMUXER, MSGL_ERR, "Invalid or unknown uvox metadata\n");
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
89 return 0;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
90 }
16031
c2e78215f0d9 Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents: 16013
diff changeset
91 if (info[1] & 0x01)
c2e78215f0d9 Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents: 16013
diff changeset
92 mp_msg(MSGT_DEMUXER, MSGL_WARN, "Encrypted ultravox data\n");
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
93 metaint = info[4] << 8 | info[5];
16031
c2e78215f0d9 Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents: 16013
diff changeset
94 if ((info[3] & 0xf) < 0x07) { // discard any metadata nonsense
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
95 char *metabuf = malloc(metaint);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
96 my_read(fd, metabuf, metaint, sc);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
97 free(metabuf);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
98 }
16031
c2e78215f0d9 Ultravox improvements according to specs (didn't know they existed *g*)
reimar
parents: 16013
diff changeset
99 } while ((info[3] & 0xf) < 0x07);
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
100 return metaint;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
101 }
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
102
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
103 /**
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
104 * \brief read one scast meta data entry and print it
16032
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
105 * \param fd file descriptor to read from
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
106 * \param sc streaming_ctrl_t whose buffer is consumed before reading from fd
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
107 */
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
108 static void scast_meta_read(int fd, streaming_ctrl_t *sc) {
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
109 unsigned char tmp = 0;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
110 unsigned metalen;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
111 my_read(fd, &tmp, 1, sc);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
112 metalen = tmp * 16;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
113 if (metalen > 0) {
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
114 char *info = (char *)malloc(metalen + 1);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
115 unsigned nlen = my_read(fd, info, metalen, sc);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
116 info[nlen] = 0;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
117 mp_msg(MSGT_DEMUXER, MSGL_INFO, "\nICY Info: %s\n", info);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
118 free(info);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
119 }
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
120 }
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
121
16032
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
122 /**
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
123 * \brief read data from scast/ultravox stream without any metadata
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
124 * \param fd file descriptor to read from
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
125 * \param buffer buffer to read data into
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
126 * \param size number of bytes to read
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
127 * \param sc streaming_ctrl_t whose buffer is consumed before reading from fd
c5a629a2f33c Forgotten doxygen comments
reimar
parents: 16031
diff changeset
128 */
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
129 static int scast_streaming_read(int fd, char *buffer, int size,
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
130 streaming_ctrl_t *sc) {
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
131 scast_data_t *sd = (scast_data_t *)sc->data;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
132 unsigned block, ret;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
133 unsigned done = 0;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
134
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
135 // first read remaining data up to next metadata
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
136 block = sd->metaint - sd->metapos;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
137 if (block > size)
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
138 block = size;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
139 ret = my_read(fd, buffer, block, sc);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
140 sd->metapos += ret;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
141 done += ret;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
142 if (ret != block) // read problems or eof
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
143 size = done;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
144
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
145 while (done < size) { // now comes the metadata
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
146 if (sd->is_ultravox)
16070
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
147 {
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
148 sd->metaint = uvox_meta_read(fd, sc);
16070
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
149 if (!sd->metaint)
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
150 size = done;
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
151 }
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
152 else
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
153 scast_meta_read(fd, sc); // read and display metadata
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
154 sd->metapos = 0;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
155 block = size - done;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
156 if (block > sd->metaint)
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
157 block = sd->metaint;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
158 ret = my_read(fd, &buffer[done], block, sc);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
159 sd->metapos += ret;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
160 done += ret;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
161 if (ret != block) // read problems or eof
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
162 size = done;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
163 }
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
164 return done;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
165 }
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
166
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
167 static int scast_streaming_start(stream_t *stream) {
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
168 int metaint;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
169 int fromhdr;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
170 scast_data_t *scast_data;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
171 HTTP_header_t *http_hdr = stream->streaming_ctrl->data;
16070
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
172 int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
173 if (!stream || stream->fd < 0 || !http_hdr)
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
174 return -1;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
175 if (is_ultravox)
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
176 metaint = 0;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
177 else {
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
178 metaint = atoi(http_get_field(http_hdr, "Icy-MetaInt"));
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
179 if (metaint <= 0)
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
180 return -1;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
181 }
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
182 stream->streaming_ctrl->buffer = malloc(http_hdr->body_size);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
183 stream->streaming_ctrl->buffer_size = http_hdr->body_size;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
184 stream->streaming_ctrl->buffer_pos = 0;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
185 memcpy(stream->streaming_ctrl->buffer, http_hdr->body, http_hdr->body_size);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
186 scast_data = malloc(sizeof(scast_data_t));
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
187 scast_data->metaint = metaint;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
188 scast_data->metapos = 0;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
189 scast_data->is_ultravox = is_ultravox;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
190 http_free(http_hdr);
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
191 stream->streaming_ctrl->data = scast_data;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
192 stream->streaming_ctrl->streaming_read = scast_streaming_read;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
193 stream->streaming_ctrl->streaming_seek = NULL;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
194 stream->streaming_ctrl->prebuffer_size = 64 * 1024; // 64 KBytes
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
195 stream->streaming_ctrl->buffering = 1;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
196 stream->streaming_ctrl->status = streaming_playing_e;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
197 return 0;
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
198 }
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
199
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
200 static int nop_streaming_start( stream_t *stream ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
201 HTTP_header_t *http_hdr = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
202 char *next_url=NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
203 URL_t *rd_url=NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
204 int fd,ret;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
205 if( stream==NULL ) return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
206
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
207 fd = stream->fd;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
208 if( fd<0 ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
209 fd = http_send_request( stream->streaming_ctrl->url, 0 );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
210 if( fd<0 ) return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
211 http_hdr = http_read_response( fd );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
212 if( http_hdr==NULL ) return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
213
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
214 switch( http_hdr->status_code ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
215 case 200: // OK
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
216 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
217 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
218 if( http_hdr->body_size>0 ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
219 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
220 http_free( http_hdr );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
221 return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
222 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
223 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
224 break;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
225 // Redirect
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
226 case 301: // Permanently
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
227 case 302: // Temporarily
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
228 ret=-1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
229 next_url = http_get_field( http_hdr, "Location" );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
230
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
231 if (next_url != NULL)
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
232 rd_url=url_new(next_url);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
233
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
234 if (next_url != NULL && rd_url != NULL) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
235 mp_msg(MSGT_NETWORK,MSGL_STATUS,"Redirected: Using this url instead %s\n",next_url);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
236 stream->streaming_ctrl->url=check4proxies(rd_url);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
237 ret=nop_streaming_start(stream); //recursively get streaming started
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
238 } else {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
239 mp_msg(MSGT_NETWORK,MSGL_ERR,"Redirection failed\n");
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
240 closesocket( fd );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
241 fd = -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
242 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
243 return ret;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
244 break;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
245 case 401: //Authorization required
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
246 case 403: //Forbidden
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
247 case 404: //Not found
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
248 case 500: //Server Error
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
249 default:
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
250 mp_msg(MSGT_NETWORK,MSGL_ERR,"Server returned code %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
251 closesocket( fd );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
252 fd = -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
253 return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
254 break;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
255 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
256 stream->fd = fd;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
257 } else {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
258 http_hdr = (HTTP_header_t*)stream->streaming_ctrl->data;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
259 if( http_hdr->body_size>0 ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
260 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
261 http_free( http_hdr );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
262 stream->streaming_ctrl->data = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
263 return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
264 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
265 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
266 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
267
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
268 if( http_hdr ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
269 http_free( http_hdr );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
270 stream->streaming_ctrl->data = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
271 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
272
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
273 stream->streaming_ctrl->streaming_read = nop_streaming_read;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
274 stream->streaming_ctrl->streaming_seek = nop_streaming_seek;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
275 stream->streaming_ctrl->prebuffer_size = 64*1024; // 64 KBytes
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
276 stream->streaming_ctrl->buffering = 1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
277 stream->streaming_ctrl->status = streaming_playing_e;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
278 return 0;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
279 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
280
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
281 HTTP_header_t *
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 16948
diff changeset
282 http_new_header(void) {
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
283 HTTP_header_t *http_hdr;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
284
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
285 http_hdr = (HTTP_header_t*)malloc(sizeof(HTTP_header_t));
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
286 if( http_hdr==NULL ) return NULL;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
287 memset( http_hdr, 0, sizeof(HTTP_header_t) );
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
288
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
289 return http_hdr;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
290 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
291
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
292 void
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
293 http_free( HTTP_header_t *http_hdr ) {
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
294 HTTP_field_t *field, *field2free;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
295 if( http_hdr==NULL ) return;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
296 if( http_hdr->protocol!=NULL ) free( http_hdr->protocol );
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
297 if( http_hdr->uri!=NULL ) free( http_hdr->uri );
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
298 if( http_hdr->reason_phrase!=NULL ) free( http_hdr->reason_phrase );
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
299 if( http_hdr->field_search!=NULL ) free( http_hdr->field_search );
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
300 if( http_hdr->method!=NULL ) free( http_hdr->method );
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
301 if( http_hdr->buffer!=NULL ) free( http_hdr->buffer );
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
302 field = http_hdr->first_field;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
303 while( field!=NULL ) {
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
304 field2free = field;
14460
475c551d9890 free http field_name to fix memleak
reimar
parents: 12391
diff changeset
305 if (field->field_name)
475c551d9890 free http field_name to fix memleak
reimar
parents: 12391
diff changeset
306 free(field->field_name);
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
307 field = field->next;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
308 free( field2free );
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
309 }
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
310 free( http_hdr );
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
311 http_hdr = NULL;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
312 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
313
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
314 int
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
315 http_response_append( HTTP_header_t *http_hdr, char *response, int length ) {
1027
2803b7076c83 Checked the length arg when appending data.
bertrand
parents: 902
diff changeset
316 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
317
7293
0d7942100437 - simpler http_response_append (uses realloc())
arpi
parents: 6514
diff changeset
318 http_hdr->buffer = (char*)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
319 if( http_hdr->buffer==NULL ) {
7293
0d7942100437 - simpler http_response_append (uses realloc())
arpi
parents: 6514
diff changeset
320 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory (re)allocation failed\n");
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
321 return -1;
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
322 }
7293
0d7942100437 - simpler http_response_append (uses realloc())
arpi
parents: 6514
diff changeset
323 memcpy( http_hdr->buffer+http_hdr->buffer_size, response, length );
0d7942100437 - simpler http_response_append (uses realloc())
arpi
parents: 6514
diff changeset
324 http_hdr->buffer_size += length;
0d7942100437 - simpler http_response_append (uses realloc())
arpi
parents: 6514
diff changeset
325 http_hdr->buffer[http_hdr->buffer_size]=0; // close the string!
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
326 return http_hdr->buffer_size;
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
327 }
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
328
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
329 int
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
330 http_is_header_entire( HTTP_header_t *http_hdr ) {
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
331 if( http_hdr==NULL ) return -1;
7293
0d7942100437 - simpler http_response_append (uses realloc())
arpi
parents: 6514
diff changeset
332 if( http_hdr->buffer==NULL ) return 0; // empty
0d7942100437 - simpler http_response_append (uses realloc())
arpi
parents: 6514
diff changeset
333
3784
8b7722329a27 warning fix == cleanup
arpi
parents: 3514
diff changeset
334 if( strstr(http_hdr->buffer, "\r\n\r\n")==NULL &&
8b7722329a27 warning fix == cleanup
arpi
parents: 3514
diff changeset
335 strstr(http_hdr->buffer, "\n\n")==NULL ) return 0;
8b7722329a27 warning fix == cleanup
arpi
parents: 3514
diff changeset
336 return 1;
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
337 }
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
338
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
339 int
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
340 http_response_parse( HTTP_header_t *http_hdr ) {
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
341 char *hdr_ptr, *ptr;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
342 char *field=NULL;
8179
63a5e03f4346 Removed hard coded value for the length of the header separator.
bertrand
parents: 7304
diff changeset
343 int pos_hdr_sep, hdr_sep_len, len;
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
344 if( http_hdr==NULL ) return -1;
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
345 if( http_hdr->is_parsed ) return 0;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
346
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
347 // Get the protocol
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
348 hdr_ptr = strstr( http_hdr->buffer, " " );
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
349 if( hdr_ptr==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
350 mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. No space separator found.\n");
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
351 return -1;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
352 }
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
353 len = hdr_ptr-http_hdr->buffer;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
354 http_hdr->protocol = (char*)malloc(len+1);
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
355 if( http_hdr->protocol==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
356 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
357 return -1;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
358 }
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
359 strncpy( http_hdr->protocol, http_hdr->buffer, len );
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
360 http_hdr->protocol[len]='\0';
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
361 if( !strncasecmp( http_hdr->protocol, "HTTP", 4) ) {
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
362 if( sscanf( http_hdr->protocol+5,"1.%d", &(http_hdr->http_minor_version) )!=1 ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
363 mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. Unable to get HTTP minor version.\n");
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
364 return -1;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
365 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
366 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
367
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
368 // Get the status code
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
369 if( sscanf( ++hdr_ptr, "%d", &(http_hdr->status_code) )!=1 ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
370 mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. Unable to get status code.\n");
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
371 return -1;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
372 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
373 hdr_ptr += 4;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
374
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
375 // Get the reason phrase
3514
43518985def8 Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents: 3497
diff changeset
376 ptr = strstr( hdr_ptr, "\n" );
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
377 if( hdr_ptr==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
378 mp_msg(MSGT_NETWORK,MSGL_ERR,"Malformed answer. Unable to get the reason phrase.\n");
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
379 return -1;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
380 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
381 len = ptr-hdr_ptr;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
382 http_hdr->reason_phrase = (char*)malloc(len+1);
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
383 if( http_hdr->reason_phrase==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
384 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
385 return -1;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
386 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
387 strncpy( http_hdr->reason_phrase, hdr_ptr, len );
4311
c9f861653fe2 Modified the output of the http_debug function.
bertrand
parents: 3785
diff changeset
388 if( http_hdr->reason_phrase[len-1]=='\r' ) {
c9f861653fe2 Modified the output of the http_debug function.
bertrand
parents: 3785
diff changeset
389 len--;
c9f861653fe2 Modified the output of the http_debug function.
bertrand
parents: 3785
diff changeset
390 }
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
391 http_hdr->reason_phrase[len]='\0';
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
392
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
393 // 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
394 hdr_sep_len = 4;
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
395 ptr = strstr( http_hdr->buffer, "\r\n\r\n" );
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
396 if( ptr==NULL ) {
3514
43518985def8 Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents: 3497
diff changeset
397 ptr = strstr( http_hdr->buffer, "\n\n" );
43518985def8 Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents: 3497
diff changeset
398 if( ptr==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
399 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
400 return -1;
43518985def8 Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents: 3497
diff changeset
401 }
8179
63a5e03f4346 Removed hard coded value for the length of the header separator.
bertrand
parents: 7304
diff changeset
402 hdr_sep_len = 2;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
403 }
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
404 pos_hdr_sep = ptr-http_hdr->buffer;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
405
3514
43518985def8 Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents: 3497
diff changeset
406 // 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
407 hdr_ptr = strstr( http_hdr->buffer, "\n" )+1;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
408 do {
3514
43518985def8 Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents: 3497
diff changeset
409 ptr = hdr_ptr;
43518985def8 Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents: 3497
diff changeset
410 while( *ptr!='\r' && *ptr!='\n' ) ptr++;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
411 len = ptr-hdr_ptr;
4816
f1dea39a50bb Fixed the http response parser when the http header only has the HTTP
bertrand
parents: 4311
diff changeset
412 if( len==0 ) break;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
413 field = (char*)realloc(field, len+1);
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
414 if( field==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
415 mp_msg(MSGT_NETWORK,MSGL_ERR,"Memory allocation failed\n");
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
416 return -1;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
417 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
418 strncpy( field, hdr_ptr, len );
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
419 field[len]='\0';
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
420 http_set_field( http_hdr, field );
3514
43518985def8 Handle broken server that doesn't send CRLF but jusr LF.
bertrand
parents: 3497
diff changeset
421 hdr_ptr = ptr+((*ptr=='\r')?2:1);
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
422 } while( hdr_ptr<(http_hdr->buffer+pos_hdr_sep) );
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
423
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
424 if( field!=NULL ) free( field );
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
425
8179
63a5e03f4346 Removed hard coded value for the length of the header separator.
bertrand
parents: 7304
diff changeset
426 if( pos_hdr_sep+hdr_sep_len<http_hdr->buffer_size ) {
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
427 // Response has data!
8179
63a5e03f4346 Removed hard coded value for the length of the header separator.
bertrand
parents: 7304
diff changeset
428 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
429 http_hdr->body_size = http_hdr->buffer_size-(pos_hdr_sep+hdr_sep_len);
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
430 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
431
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
432 http_hdr->is_parsed = 1;
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
433 return 0;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
434 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
435
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
436 char *
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
437 http_build_request( HTTP_header_t *http_hdr ) {
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
438 char *ptr, *uri=NULL;
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
439 int len;
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
440 HTTP_field_t *field;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
441 if( http_hdr==NULL ) return NULL;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
442
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
443 if( http_hdr->method==NULL ) http_set_method( http_hdr, "GET");
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
444 if( http_hdr->uri==NULL ) http_set_uri( http_hdr, "/");
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
445 else {
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12083
diff changeset
446 uri = (char*)malloc(strlen(http_hdr->uri) + 1);
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
447 if( uri==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
448 mp_msg(MSGT_NETWORK,MSGL_ERR,"Memory allocation failed\n");
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
449 return NULL;
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
450 }
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12083
diff changeset
451 strcpy(uri,http_hdr->uri);
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
452 }
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
453
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
454 //**** Compute the request length
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
455 // Add the Method line
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
456 len = strlen(http_hdr->method)+strlen(uri)+12;
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
457 // Add the fields
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
458 field = http_hdr->first_field;
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
459 while( field!=NULL ) {
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
460 len += strlen(field->field_name)+2;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
461 field = field->next;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
462 }
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
463 // Add the CRLF
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
464 len += 2;
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
465 // Add the body
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
466 if( http_hdr->body!=NULL ) {
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
467 len += http_hdr->body_size;
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
468 }
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
469 // Free the buffer if it was previously used
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
470 if( http_hdr->buffer!=NULL ) {
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
471 free( http_hdr->buffer );
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
472 http_hdr->buffer = NULL;
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
473 }
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
474 http_hdr->buffer = (char*)malloc(len+1);
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
475 if( http_hdr->buffer==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
476 mp_msg(MSGT_NETWORK,MSGL_ERR,"Memory allocation failed\n");
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
477 return NULL;
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
478 }
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
479 http_hdr->buffer_size = len;
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
480
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
481 //*** Building the request
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
482 ptr = http_hdr->buffer;
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
483 // Add the method line
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
484 ptr += sprintf( ptr, "%s %s HTTP/1.%d\r\n", http_hdr->method, uri, http_hdr->http_minor_version );
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
485 field = http_hdr->first_field;
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
486 // Add the field
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
487 while( field!=NULL ) {
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
488 ptr += sprintf( ptr, "%s\r\n", field->field_name );
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
489 field = field->next;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
490 }
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
491 ptr += sprintf( ptr, "\r\n" );
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
492 // Add the body
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
493 if( http_hdr->body!=NULL ) {
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
494 memcpy( ptr, http_hdr->body, http_hdr->body_size );
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
495 }
3497
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
496
6c1e57bdbd96 Made the HTTP request escaped the url.
bertrand
parents: 3039
diff changeset
497 if( uri ) free( uri );
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
498 return http_hdr->buffer;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
499 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
500
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
501 char *
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
502 http_get_field( HTTP_header_t *http_hdr, const char *field_name ) {
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
503 if( http_hdr==NULL || field_name==NULL ) return NULL;
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
504 http_hdr->field_search_pos = http_hdr->first_field;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
505 http_hdr->field_search = (char*)realloc( http_hdr->field_search, strlen(field_name)+1 );
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
506 if( http_hdr->field_search==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
507 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
508 return NULL;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
509 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
510 strcpy( http_hdr->field_search, field_name );
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
511 return http_get_next_field( http_hdr );
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
512 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
513
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
514 char *
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
515 http_get_next_field( HTTP_header_t *http_hdr ) {
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
516 char *ptr;
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
517 HTTP_field_t *field;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
518 if( http_hdr==NULL ) return NULL;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
519
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
520 field = http_hdr->field_search_pos;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
521 while( field!=NULL ) {
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
522 ptr = strstr( field->field_name, ":" );
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
523 if( ptr==NULL ) return NULL;
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
524 if( !strncasecmp( field->field_name, http_hdr->field_search, ptr-(field->field_name) ) ) {
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
525 ptr++; // Skip the column
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
526 while( ptr[0]==' ' ) ptr++; // Skip the spaces if there is some
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
527 http_hdr->field_search_pos = field->next;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
528 return ptr; // return the value without the field name
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
529 }
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
530 field = field->next;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
531 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
532 return NULL;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
533 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
534
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
535 void
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
536 http_set_field( HTTP_header_t *http_hdr, const char *field_name ) {
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
537 HTTP_field_t *new_field;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
538 if( http_hdr==NULL || field_name==NULL ) return;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
539
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
540 new_field = (HTTP_field_t*)malloc(sizeof(HTTP_field_t));
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
541 if( new_field==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
542 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
543 return;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
544 }
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
545 new_field->next = NULL;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
546 new_field->field_name = (char*)malloc(strlen(field_name)+1);
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
547 if( new_field->field_name==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
548 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
549 return;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
550 }
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
551 strcpy( new_field->field_name, field_name );
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
552
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
553 if( http_hdr->last_field==NULL ) {
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
554 http_hdr->first_field = new_field;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
555 } else {
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
556 http_hdr->last_field->next = new_field;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
557 }
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
558 http_hdr->last_field = new_field;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
559 http_hdr->field_nb++;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
560 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
561
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
562 void
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
563 http_set_method( HTTP_header_t *http_hdr, const char *method ) {
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
564 if( http_hdr==NULL || method==NULL ) return;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
565
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
566 http_hdr->method = (char*)malloc(strlen(method)+1);
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
567 if( http_hdr->method==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
568 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
569 return;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
570 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
571 strcpy( http_hdr->method, method );
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
572 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
573
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
574 void
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
575 http_set_uri( HTTP_header_t *http_hdr, const char *uri ) {
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
576 if( http_hdr==NULL || uri==NULL ) return;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
577
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
578 http_hdr->uri = (char*)malloc(strlen(uri)+1);
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
579 if( http_hdr->uri==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
580 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
581 return;
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
582 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
583 strcpy( http_hdr->uri, uri );
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
584 }
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
585
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
586 int
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
587 http_add_basic_authentication( HTTP_header_t *http_hdr, const char *username, const char *password ) {
18094
16f2bcd5d148 free memory on error in http_add_basic_authentication
reimar
parents: 17932
diff changeset
588 char *auth = NULL, *usr_pass = NULL, *b64_usr_pass = NULL;
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
589 int encoded_len, pass_len=0, out_len;
18094
16f2bcd5d148 free memory on error in http_add_basic_authentication
reimar
parents: 17932
diff changeset
590 int res = -1;
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
591 if( http_hdr==NULL || username==NULL ) return -1;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
592
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
593 if( password!=NULL ) {
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
594 pass_len = strlen(password);
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
595 }
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
596
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
597 usr_pass = (char*)malloc(strlen(username)+pass_len+2);
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
598 if( usr_pass==NULL ) {
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
599 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
18094
16f2bcd5d148 free memory on error in http_add_basic_authentication
reimar
parents: 17932
diff changeset
600 goto out;
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
601 }
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
602
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
603 sprintf( usr_pass, "%s:%s", username, (password==NULL)?"":password );
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
604
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
605 // Base 64 encode with at least 33% more data than the original size
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
606 encoded_len = strlen(usr_pass)*2;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
607 b64_usr_pass = (char*)malloc(encoded_len);
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
608 if( b64_usr_pass==NULL ) {
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
609 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
18094
16f2bcd5d148 free memory on error in http_add_basic_authentication
reimar
parents: 17932
diff changeset
610 goto out;
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
611 }
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
612
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
613 out_len = base64_encode( usr_pass, strlen(usr_pass), b64_usr_pass, encoded_len);
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
614 if( out_len<0 ) {
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
615 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
616 goto out;
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
617 }
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
618
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
619 b64_usr_pass[out_len]='\0';
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
620
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
621 auth = (char*)malloc(encoded_len+22);
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
622 if( auth==NULL ) {
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
623 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
18094
16f2bcd5d148 free memory on error in http_add_basic_authentication
reimar
parents: 17932
diff changeset
624 goto out;
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
625 }
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
626
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
627 sprintf( auth, "Authorization: Basic %s", b64_usr_pass);
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
628 http_set_field( http_hdr, auth );
18094
16f2bcd5d148 free memory on error in http_add_basic_authentication
reimar
parents: 17932
diff changeset
629 res = 0;
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
630
18094
16f2bcd5d148 free memory on error in http_add_basic_authentication
reimar
parents: 17932
diff changeset
631 out:
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
632 free( usr_pass );
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
633 free( b64_usr_pass );
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
634 free( auth );
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
635
18094
16f2bcd5d148 free memory on error in http_add_basic_authentication
reimar
parents: 17932
diff changeset
636 return res;
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
637 }
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
638
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
639 void
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
640 http_debug_hdr( HTTP_header_t *http_hdr ) {
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
641 HTTP_field_t *field;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
642 int i = 0;
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 870
diff changeset
643 if( http_hdr==NULL ) return;
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
644
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
645 mp_msg(MSGT_NETWORK,MSGL_V,"--- HTTP DEBUG HEADER --- START ---\n");
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
646 mp_msg(MSGT_NETWORK,MSGL_V,"protocol: [%s]\n", http_hdr->protocol );
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
647 mp_msg(MSGT_NETWORK,MSGL_V,"http minor version: [%d]\n", http_hdr->http_minor_version );
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
648 mp_msg(MSGT_NETWORK,MSGL_V,"uri: [%s]\n", http_hdr->uri );
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
649 mp_msg(MSGT_NETWORK,MSGL_V,"method: [%s]\n", http_hdr->method );
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
650 mp_msg(MSGT_NETWORK,MSGL_V,"status code: [%d]\n", http_hdr->status_code );
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
651 mp_msg(MSGT_NETWORK,MSGL_V,"reason phrase: [%s]\n", http_hdr->reason_phrase );
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
652 mp_msg(MSGT_NETWORK,MSGL_V,"body size: [%d]\n", http_hdr->body_size );
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
653
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
654 mp_msg(MSGT_NETWORK,MSGL_V,"Fields:\n");
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
655 field = http_hdr->first_field;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
656 while( field!=NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
657 mp_msg(MSGT_NETWORK,MSGL_V," %d - %s\n", i++, field->field_name );
3039
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
658 field = field->next;
80189681c02b Removed the field number limitation.
bertrand
parents: 2489
diff changeset
659 }
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 4816
diff changeset
660 mp_msg(MSGT_NETWORK,MSGL_V,"--- HTTP DEBUG HEADER --- END ---\n");
870
f641c96e431b Some simple code to handle HTTP requests/responses.
bertrand
parents:
diff changeset
661 }
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
662
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
663 int
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
664 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
665 static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
666
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
667 unsigned char *encBuf;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
668 int outLen;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
669 unsigned int bits;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
670 unsigned int shift;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
671
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
672 encBuf = (unsigned char*)enc;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
673 outLen = 0;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
674 bits = 0;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
675 shift = 0;
17778
37bfcf89c89c Fix base64 encoding for basic auth according to RFC.
reimar
parents: 17566
diff changeset
676 outMax &= ~3;
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
677
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
678 while( outLen<outMax ) {
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
679 if( encLen>0 ) {
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
680 // Shift in byte
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
681 bits <<= 8;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
682 bits |= *encBuf;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
683 shift += 8;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
684 // Next byte
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
685 encBuf++;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
686 encLen--;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
687 } else if( shift>0 ) {
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
688 // Pad last bits to 6 bits - will end next loop
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
689 bits <<= 6 - shift;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
690 shift = 6;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
691 } else {
17778
37bfcf89c89c Fix base64 encoding for basic auth according to RFC.
reimar
parents: 17566
diff changeset
692 // As per RFC 2045, section 6.8,
37bfcf89c89c Fix base64 encoding for basic auth according to RFC.
reimar
parents: 17566
diff changeset
693 // pad output as necessary: 0 to 2 '=' chars.
37bfcf89c89c Fix base64 encoding for basic auth according to RFC.
reimar
parents: 17566
diff changeset
694 while( outLen & 3 ){
37bfcf89c89c Fix base64 encoding for basic auth according to RFC.
reimar
parents: 17566
diff changeset
695 *out++ = '=';
37bfcf89c89c Fix base64 encoding for basic auth according to RFC.
reimar
parents: 17566
diff changeset
696 outLen++;
37bfcf89c89c Fix base64 encoding for basic auth according to RFC.
reimar
parents: 17566
diff changeset
697 }
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
698
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
699 return outLen;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
700 }
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
701
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
702 // Encode 6 bit segments
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
703 while( shift>=6 ) {
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
704 shift -= 6;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
705 *out = b64[ (bits >> shift) & 0x3F ];
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
706 out++;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
707 outLen++;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
708 }
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
709 }
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
710
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
711 // Output overflow
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
712 return -1;
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
713 }
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
714
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
715 static int http_streaming_start(stream_t *stream, int* file_format) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
716 HTTP_header_t *http_hdr;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
717 unsigned int i;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
718 int fd=-1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
719 int redirect = 0;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
720 int auth_retry=0;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
721 int seekable=0;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
722 char *content_type;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
723 char *next_url;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
724 URL_t *url = stream->streaming_ctrl->url;
6514
37b0b3302395 Added base64 encoder
bertrand
parents: 6465
diff changeset
725
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
726 do
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
727 {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
728 fd = http_send_request( url, 0 );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
729 if( fd<0 ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
730 return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
731 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
732
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
733 http_hdr = http_read_response( fd );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
734 if( http_hdr==NULL ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
735 closesocket( fd );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
736 http_free( http_hdr );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
737 return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
738 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
739
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
740 stream->fd=fd;
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17778
diff changeset
741 if( mp_msg_test(MSGT_NETWORK,MSGL_V) ) {
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
742 http_debug_hdr( http_hdr );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
743 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
744
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
745 stream->streaming_ctrl->data = (void*)http_hdr;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
746
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
747 // Check if we can make partial content requests and thus seek in http-streams
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
748 if( http_hdr!=NULL && http_hdr->status_code==200 ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
749 char *accept_ranges;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
750 if( (accept_ranges = http_get_field(http_hdr,"Accept-Ranges")) != NULL )
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
751 seekable = strncmp(accept_ranges,"bytes",5)==0;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
752 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
753
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
754 // Check if the response is an ICY status_code reason_phrase
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
755 if( !strcasecmp(http_hdr->protocol, "ICY") ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
756 switch( http_hdr->status_code ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
757 case 200: { // OK
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
758 char *field_data = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
759 // note: I skip icy-notice1 and 2, as they contain html <BR>
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
760 // and are IMHO useless info ::atmos
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
761 if( (field_data = http_get_field(http_hdr, "icy-name")) != NULL )
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
762 mp_msg(MSGT_NETWORK,MSGL_INFO,"Name : %s\n", field_data); field_data = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
763 if( (field_data = http_get_field(http_hdr, "icy-genre")) != NULL )
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
764 mp_msg(MSGT_NETWORK,MSGL_INFO,"Genre : %s\n", field_data); field_data = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
765 if( (field_data = http_get_field(http_hdr, "icy-url")) != NULL )
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
766 mp_msg(MSGT_NETWORK,MSGL_INFO,"Website: %s\n", field_data); field_data = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
767 // XXX: does this really mean public server? ::atmos
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
768 if( (field_data = http_get_field(http_hdr, "icy-pub")) != NULL )
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
769 mp_msg(MSGT_NETWORK,MSGL_INFO,"Public : %s\n", atoi(field_data)?"yes":"no"); field_data = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
770 if( (field_data = http_get_field(http_hdr, "icy-br")) != NULL )
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
771 mp_msg(MSGT_NETWORK,MSGL_INFO,"Bitrate: %skbit/s\n", field_data); field_data = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
772
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
773 // If content-type == video/nsv we most likely have a winamp video stream
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
774 // otherwise it should be mp3. if there are more types consider adding mime type
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
775 // handling like later
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
776 if ( (field_data = http_get_field(http_hdr, "content-type")) != NULL && (!strcmp(field_data, "video/nsv") || !strcmp(field_data, "misc/ultravox")))
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
777 *file_format = DEMUXER_TYPE_NSV;
16948
9b7925705f5b Add another content-type for aac audio in shoutcast streams
rtognimp
parents: 16932
diff changeset
778 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
779 *file_format = DEMUXER_TYPE_AAC;
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
780 else
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
781 *file_format = DEMUXER_TYPE_AUDIO;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
782 return 0;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
783 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
784 case 400: // Server Full
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
785 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server is full, skipping!\n");
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
786 return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
787 case 401: // Service Unavailable
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
788 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server return service unavailable, skipping!\n");
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
789 return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
790 case 403: // Service Forbidden
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
791 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server return 'Service Forbidden'\n");
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
792 return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
793 case 404: // Resource Not Found
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
794 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server couldn't find requested stream, skipping!\n");
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
795 return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
796 default:
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
797 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: unhandled ICY-Errorcode, contact MPlayer developers!\n");
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
798 return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
799 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
800 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
801
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
802 // Assume standard http if not ICY
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
803 switch( http_hdr->status_code ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
804 case 200: // OK
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
805 // Look if we can use the Content-Type
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
806 content_type = http_get_field( http_hdr, "Content-Type" );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
807 if( content_type!=NULL ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
808 char *content_length = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
809 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", content_type );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
810 if( (content_length = http_get_field(http_hdr, "Content-Length")) != NULL)
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
811 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length"));
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
812 // Check in the mime type table for a demuxer type
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
813 i = 0;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
814 while(mime_type_table[i].mime_type != NULL) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
815 if( !strcasecmp( content_type, mime_type_table[i].mime_type ) ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
816 *file_format = mime_type_table[i].demuxer_type;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
817 return seekable;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
818 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
819 i++;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
820 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
821 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
822 // Not found in the mime type table, don't fail,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
823 // we should try raw HTTP
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
824 return seekable;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
825 // Redirect
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
826 case 301: // Permanently
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
827 case 302: // Temporarily
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
828 // TODO: RFC 2616, recommand to detect infinite redirection loops
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
829 next_url = http_get_field( http_hdr, "Location" );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
830 if( next_url!=NULL ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
831 closesocket( fd );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
832 url_free( url );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
833 stream->streaming_ctrl->url = url = url_new( next_url );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
834 http_free( http_hdr );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
835 redirect = 1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
836 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
837 break;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
838 case 401: // Authentication required
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
839 if( http_authenticate(http_hdr, url, &auth_retry)<0 ) return STREAM_UNSUPORTED;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
840 redirect = 1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
841 break;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
842 default:
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
843 mp_msg(MSGT_NETWORK,MSGL_ERR,"Server returned %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
844 return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
845 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
846 } while( redirect );
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
847
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
848 return -1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
849 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
850
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
851 static int fixup_open(stream_t *stream,int seekable) {
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
852 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
853 int is_icy = http_hdr && http_get_field(http_hdr, "Icy-MetaInt");
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
854 char *content_type = http_get_field( http_hdr, "Content-Type" );
16070
d56d00a47568 Multiple unsv/scast bug fixes.
reimar
parents: 16032
diff changeset
855 int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
856
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
857 stream->type = STREAMTYPE_STREAM;
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
858 if(!is_icy && !is_ultravox && seekable)
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
859 {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
860 stream->flags |= STREAM_SEEK;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
861 stream->seek = http_seek;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
862 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
863 stream->streaming_ctrl->bandwidth = network_bandwidth;
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
864 if ((!is_icy && !is_ultravox) || scast_streaming_start(stream))
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
865 if(nop_streaming_start( stream )) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
866 mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_start failed\n");
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
867 streaming_ctrl_free(stream->streaming_ctrl);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
868 stream->streaming_ctrl = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
869 return STREAM_UNSUPORTED;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
870 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
871
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
872 fixup_network_stream_cache(stream);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
873 return STREAM_OK;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
874 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
875
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
876 static int open_s1(stream_t *stream,int mode, void* opts, int* file_format) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
877 int seekable=0;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
878 URL_t *url;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
879
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
880 stream->streaming_ctrl = streaming_ctrl_new();
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
881 if( stream->streaming_ctrl==NULL ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
882 return STREAM_ERROR;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
883 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
884 stream->streaming_ctrl->bandwidth = network_bandwidth;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
885 url = url_new(stream->url);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
886 stream->streaming_ctrl->url = check4proxies(url);
16417
be6bbd50ec20 memleak fixes when invalid http url specified.
reimar
parents: 16078
diff changeset
887 url_free(url);
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
888
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
889 mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_HTTP(1), URL: %s\n", stream->url);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
890 seekable = http_streaming_start(stream, file_format);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
891 if((seekable < 0) || (*file_format == DEMUXER_TYPE_ASF)) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
892 streaming_ctrl_free(stream->streaming_ctrl);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
893 stream->streaming_ctrl = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
894 return STREAM_UNSUPORTED;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
895 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
896
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
897 return fixup_open(stream, seekable);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
898 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
899
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
900 static int open_s2(stream_t *stream,int mode, void* opts, int* file_format) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
901 int seekable=0;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
902 URL_t *url;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
903
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
904 stream->streaming_ctrl = streaming_ctrl_new();
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
905 if( stream->streaming_ctrl==NULL ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
906 return STREAM_ERROR;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
907 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
908 stream->streaming_ctrl->bandwidth = network_bandwidth;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
909 url = url_new(stream->url);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
910 stream->streaming_ctrl->url = check4proxies(url);
16614
3e63ab4120b2 another url_free that shouldn't be commented out.
reimar
parents: 16417
diff changeset
911 url_free(url);
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
912
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
913 mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_HTTP(2), URL: %s\n", stream->url);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
914 seekable = http_streaming_start(stream, file_format);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
915 if(seekable < 0) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
916 streaming_ctrl_free(stream->streaming_ctrl);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
917 stream->streaming_ctrl = NULL;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
918 return STREAM_UNSUPORTED;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
919 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
920
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
921 return fixup_open(stream, seekable);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
922 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
923
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
924
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
925 stream_info_t stream_info_http1 = {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
926 "http streaming",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
927 "null",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
928 "Bertrand, Albeau, Reimar Doeffinger, Arpi?",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
929 "plain http",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
930 open_s1,
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15732
diff changeset
931 {"http", "http_proxy", "unsv", NULL},
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
932 NULL,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
933 0 // Urls are an option string
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
934 };
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
935
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
936 stream_info_t stream_info_http2 = {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
937 "http streaming",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
938 "null",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
939 "Bertrand, Albeu, Arpi? who?",
16932
c30e0970250c fix typos: aslo->also, falback->fallback (they were just too annoying *g*)
reimar
parents: 16917
diff changeset
940 "plain http, also used as fallback for many other protocols",
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
941 open_s2,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
942 {"http", "http_proxy", "pnm", "mms", "mmsu", "mmst", "rtsp", NULL}, //all the others as fallback
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
943 NULL,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
944 0 // Urls are an option string
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14460
diff changeset
945 };