annotate stream/http.c @ 29328:c2ace2a6a01c

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