Mercurial > mplayer.hg
annotate stream/network.c @ 21542:0c19aa6f8e4e
Fix misplaced http_free
| author | reimar |
|---|---|
| date | Sat, 09 Dec 2006 19:50:08 +0000 |
| parents | 94ac700b2898 |
| children | 853c5dbaa91e |
| rev | line source |
|---|---|
| 903 | 1 /* |
| 2 * Network layer for MPlayer | |
| 3 * by Bertrand BAUDET <bertrand_baudet@yahoo.com> | |
| 4 * (C) 2001, MPlayer team. | |
| 5 */ | |
| 6 | |
| 1028 | 7 //#define DUMP2FILE |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
8 |
| 1430 | 9 #include <stdio.h> |
| 10 #include <stdlib.h> | |
| 11 #include <string.h> | |
| 833 | 12 #include <unistd.h> |
| 1430 | 13 |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
14 #include <errno.h> |
| 903 | 15 #include <ctype.h> |
| 833 | 16 |
|
2555
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2489
diff
changeset
|
17 #include "config.h" |
|
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2489
diff
changeset
|
18 |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
19 #include "mp_msg.h" |
|
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
20 #include "help_mp.h" |
|
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
21 |
| 10281 | 22 #ifndef HAVE_WINSOCK2 |
| 23 #define closesocket close | |
| 24 #else | |
| 25 #include <winsock2.h> | |
| 26 #include <ws2tcpip.h> | |
| 27 #endif | |
| 28 | |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
29 #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
|
30 #include "libmpdemux/demuxer.h" |
| 17012 | 31 #include "m_config.h" |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
32 |
| 841 | 33 #include "network.h" |
|
19335
2a9d669e5ff6
isolated tcp socket code from network.c to a dedicated file
ben
parents:
19331
diff
changeset
|
34 #include "tcp.h" |
| 903 | 35 #include "http.h" |
|
11583
2af52902e7dc
Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents:
11505
diff
changeset
|
36 #include "cookies.h" |
| 903 | 37 #include "url.h" |
| 841 | 38 |
| 17012 | 39 #include "version.h" |
| 6466 | 40 |
| 7867 | 41 extern int stream_cache_size; |
| 4121 | 42 |
|
7862
013c255225d8
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents:
7513
diff
changeset
|
43 extern int mp_input_check_interrupt(int time); |
|
013c255225d8
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents:
7513
diff
changeset
|
44 |
|
11583
2af52902e7dc
Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents:
11505
diff
changeset
|
45 /* Variables for the command line option -user, -passwd, -bandwidth, |
|
2af52902e7dc
Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents:
11505
diff
changeset
|
46 -user-agent and -nocookies */ |
|
2af52902e7dc
Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents:
11505
diff
changeset
|
47 |
| 7867 | 48 char *network_username=NULL; |
| 49 char *network_password=NULL; | |
| 50 int network_bandwidth=0; | |
|
11583
2af52902e7dc
Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents:
11505
diff
changeset
|
51 int network_cookies_enabled = 0; |
| 11228 | 52 char *network_useragent=NULL; |
|
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
53 |
|
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
54 /* IPv6 options */ |
|
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
55 int network_ipv4_only_proxy = 0; |
|
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
56 |
|
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
57 |
| 15585 | 58 mime_struct_t mime_type_table[] = { |
| 3042 | 59 // MP3 streaming, some MP3 streaming server answer with audio/mpeg |
|
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
60 { "audio/mpeg", DEMUXER_TYPE_AUDIO }, |
| 3042 | 61 // MPEG streaming |
|
14002
009337ffcfc4
forced autodetection of file format when content-type is video-x-mpeg to give mpeg-ts a chance
nicodvb
parents:
12894
diff
changeset
|
62 { "video/mpeg", DEMUXER_TYPE_UNKNOWN }, |
|
009337ffcfc4
forced autodetection of file format when content-type is video-x-mpeg to give mpeg-ts a chance
nicodvb
parents:
12894
diff
changeset
|
63 { "video/x-mpeg", DEMUXER_TYPE_UNKNOWN }, |
|
009337ffcfc4
forced autodetection of file format when content-type is video-x-mpeg to give mpeg-ts a chance
nicodvb
parents:
12894
diff
changeset
|
64 { "video/x-mpeg2", DEMUXER_TYPE_UNKNOWN }, |
| 3042 | 65 // AVI ??? => video/x-msvideo |
| 66 { "video/x-msvideo", DEMUXER_TYPE_AVI }, | |
| 67 // MOV => video/quicktime | |
| 68 { "video/quicktime", DEMUXER_TYPE_MOV }, | |
| 69 // ASF | |
| 70 { "audio/x-ms-wax", DEMUXER_TYPE_ASF }, | |
| 71 { "audio/x-ms-wma", DEMUXER_TYPE_ASF }, | |
| 72 { "video/x-ms-asf", DEMUXER_TYPE_ASF }, | |
| 73 { "video/x-ms-afs", DEMUXER_TYPE_ASF }, | |
| 74 { "video/x-ms-wvx", DEMUXER_TYPE_ASF }, | |
| 75 { "video/x-ms-wmv", DEMUXER_TYPE_ASF }, | |
| 76 { "video/x-ms-wma", DEMUXER_TYPE_ASF }, | |
| 17235 | 77 { "application/x-mms-framed", DEMUXER_TYPE_ASF }, |
|
17657
f5f4200785fc
More complete ASF MIME detection, closing bug# 248,
gpoirier
parents:
17566
diff
changeset
|
78 { "application/vnd.ms.wms-hdr.asfv1", DEMUXER_TYPE_ASF }, |
|
19841
e7f56cc4505e
Change demuxer for "application/octet-stream" http streams from
eugeni
parents:
19335
diff
changeset
|
79 { "application/octet-stream", DEMUXER_TYPE_UNKNOWN }, |
| 4783 | 80 // Playlists |
| 7393 | 81 { "video/x-ms-wmx", DEMUXER_TYPE_PLAYLIST }, |
| 4783 | 82 { "audio/x-scpls", DEMUXER_TYPE_PLAYLIST }, |
| 83 { "audio/x-mpegurl", DEMUXER_TYPE_PLAYLIST }, | |
| 6032 | 84 { "audio/x-pls", DEMUXER_TYPE_PLAYLIST }, |
| 85 // Real Media | |
|
15209
b9c199dd123f
Do not force real demuxer on x-pn-realaudio mimetype
rtognimp
parents:
14720
diff
changeset
|
86 // { "audio/x-pn-realaudio", DEMUXER_TYPE_REAL }, |
|
8114
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
87 // OGG Streaming |
| 12175 | 88 { "application/x-ogg", DEMUXER_TYPE_OGG }, |
| 89 // NullSoft Streaming Video | |
|
12477
1550ef7117c4
Add detection of nsa streamed by aol ultravox server
rtognimp
parents:
12390
diff
changeset
|
90 { "video/nsv", DEMUXER_TYPE_NSV}, |
| 15585 | 91 { "misc/ultravox", DEMUXER_TYPE_NSV}, |
| 92 { NULL, DEMUXER_TYPE_UNKNOWN}, | |
| 3042 | 93 }; |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
94 |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
95 |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
96 streaming_ctrl_t * |
|
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17235
diff
changeset
|
97 streaming_ctrl_new(void) { |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
98 streaming_ctrl_t *streaming_ctrl; |
|
19062
83c3afeab35d
drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents:
18466
diff
changeset
|
99 streaming_ctrl = malloc(sizeof(streaming_ctrl_t)); |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
100 if( streaming_ctrl==NULL ) { |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
101 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
102 return NULL; |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
103 } |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
104 memset( streaming_ctrl, 0, sizeof(streaming_ctrl_t) ); |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
105 return streaming_ctrl; |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
106 } |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
107 |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
108 void |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
109 streaming_ctrl_free( streaming_ctrl_t *streaming_ctrl ) { |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
110 if( streaming_ctrl==NULL ) return; |
|
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
111 if( streaming_ctrl->url ) url_free( streaming_ctrl->url ); |
|
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
112 if( streaming_ctrl->buffer ) free( streaming_ctrl->buffer ); |
|
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
113 if( streaming_ctrl->data ) free( streaming_ctrl->data ); |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
114 free( streaming_ctrl ); |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
115 } |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
116 |
|
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
117 URL_t* |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
118 check4proxies( URL_t *url ) { |
| 4652 | 119 URL_t *url_out = NULL; |
|
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
120 if( url==NULL ) return NULL; |
| 4652 | 121 url_out = url_new( url->url ); |
|
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
122 if( !strcasecmp(url->protocol, "http_proxy") ) { |
| 5915 | 123 mp_msg(MSGT_NETWORK,MSGL_V,"Using HTTP proxy: http://%s:%d\n", url->hostname, url->port ); |
| 4652 | 124 return url_out; |
|
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
125 } |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
126 // Check if the http_proxy environment variable is set. |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
127 if( !strcasecmp(url->protocol, "http") ) { |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
128 char *proxy; |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
129 proxy = getenv("http_proxy"); |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
130 if( proxy!=NULL ) { |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
131 // We got a proxy, build the URL to use it |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
132 int len; |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
133 char *new_url; |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
134 URL_t *tmp_url; |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
135 URL_t *proxy_url = url_new( proxy ); |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
136 |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
137 if( proxy_url==NULL ) { |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
138 mp_msg(MSGT_NETWORK,MSGL_WARN, |
|
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
139 MSGTR_MPDEMUX_NW_InvalidProxySettingTryingWithout); |
| 4652 | 140 return url_out; |
|
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
141 } |
|
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
142 |
|
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
143 #ifdef HAVE_AF_INET6 |
|
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
144 if (network_ipv4_only_proxy && (gethostbyname(url->hostname)==NULL)) { |
|
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
145 mp_msg(MSGT_NETWORK,MSGL_WARN, |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
146 MSGTR_MPDEMUX_NW_CantResolvTryingWithoutProxy); |
| 16419 | 147 url_free(proxy_url); |
|
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
148 return url_out; |
|
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
149 } |
|
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
150 #endif |
|
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
151 |
| 5915 | 152 mp_msg(MSGT_NETWORK,MSGL_V,"Using HTTP proxy: %s\n", proxy_url->url ); |
|
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
153 len = strlen( proxy_url->hostname ) + strlen( url->url ) + 20; // 20 = http_proxy:// + port |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
154 new_url = malloc( len+1 ); |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
155 if( new_url==NULL ) { |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
156 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
| 16419 | 157 url_free(proxy_url); |
| 4652 | 158 return url_out; |
|
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
159 } |
| 5915 | 160 sprintf(new_url, "http_proxy://%s:%d/%s", proxy_url->hostname, proxy_url->port, url->url ); |
|
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
161 tmp_url = url_new( new_url ); |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
162 if( tmp_url==NULL ) { |
| 16419 | 163 free( new_url ); |
| 164 url_free( proxy_url ); | |
| 4652 | 165 return url_out; |
|
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
166 } |
| 4652 | 167 url_free( url_out ); |
| 168 url_out = tmp_url; | |
|
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
169 free( new_url ); |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
170 url_free( proxy_url ); |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
171 } |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
172 } |
| 4652 | 173 return url_out; |
|
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
174 } |
|
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
175 |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
176 int |
| 11965 | 177 http_send_request( URL_t *url, off_t pos ) { |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
178 HTTP_header_t *http_hdr; |
| 4121 | 179 URL_t *server_url; |
| 11228 | 180 char str[256]; |
| 21535 | 181 int fd = -1; |
| 4121 | 182 int ret; |
| 183 int proxy = 0; // Boolean | |
| 184 | |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
185 http_hdr = http_new_header(); |
| 4121 | 186 |
| 4145 | 187 if( !strcasecmp(url->protocol, "http_proxy") ) { |
| 4121 | 188 proxy = 1; |
| 189 server_url = url_new( (url->file)+1 ); | |
| 190 http_set_uri( http_hdr, server_url->url ); | |
| 191 } else { | |
| 192 server_url = url; | |
| 193 http_set_uri( http_hdr, server_url->file ); | |
| 194 } | |
|
12638
2ebd553876c8
RFC compliance patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
12610
diff
changeset
|
195 if (server_url->port && server_url->port != 80) |
|
2ebd553876c8
RFC compliance patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
12610
diff
changeset
|
196 snprintf(str, 256, "Host: %s:%d", server_url->hostname, server_url->port ); |
|
2ebd553876c8
RFC compliance patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
12610
diff
changeset
|
197 else |
|
2ebd553876c8
RFC compliance patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
12610
diff
changeset
|
198 snprintf(str, 256, "Host: %s", server_url->hostname ); |
| 3585 | 199 http_set_field( http_hdr, str); |
| 11228 | 200 if (network_useragent) |
| 201 { | |
| 202 snprintf(str, 256, "User-Agent: %s", network_useragent); | |
| 203 http_set_field(http_hdr, str); | |
| 204 } | |
| 205 else | |
| 206 http_set_field( http_hdr, "User-Agent: MPlayer/"VERSION); | |
| 11965 | 207 |
| 16013 | 208 http_set_field(http_hdr, "Icy-MetaData: 1"); |
| 209 | |
| 11965 | 210 if(pos>0) { |
| 211 // Extend http_send_request with possibility to do partial content retrieval | |
|
16750
0a31740dd5e6
Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents:
16419
diff
changeset
|
212 snprintf(str, 256, "Range: bytes=%"PRId64"-", (int64_t)pos); |
| 11965 | 213 http_set_field(http_hdr, str); |
| 214 } | |
|
11583
2af52902e7dc
Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents:
11505
diff
changeset
|
215 |
|
2af52902e7dc
Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents:
11505
diff
changeset
|
216 if (network_cookies_enabled) cookies_set( http_hdr, server_url->hostname, server_url->url ); |
|
2af52902e7dc
Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents:
11505
diff
changeset
|
217 |
| 12352 | 218 http_set_field( http_hdr, "Connection: close"); |
| 6515 | 219 http_add_basic_authentication( http_hdr, url->username, url->password ); |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
220 if( http_build_request( http_hdr )==NULL ) { |
| 16417 | 221 goto err_out; |
| 833 | 222 } |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
223 |
| 4121 | 224 if( proxy ) { |
| 225 if( url->port==0 ) url->port = 8080; // Default port for the proxy server | |
|
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
226 fd = connect2Server( url->hostname, url->port,1 ); |
| 4121 | 227 url_free( server_url ); |
|
17777
13b2332c5154
missing url_free when using proxy and connect fails
reimar
parents:
17657
diff
changeset
|
228 server_url = NULL; |
| 4121 | 229 } else { |
| 230 if( server_url->port==0 ) server_url->port = 80; // Default port for the web server | |
|
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
231 fd = connect2Server( server_url->hostname, server_url->port,1 ); |
| 4121 | 232 } |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
233 if( fd<0 ) { |
| 16417 | 234 goto err_out; |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
235 } |
| 5915 | 236 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Request: [%s]\n", http_hdr->buffer ); |
| 4121 | 237 |
|
10206
35e306346e59
Using recv/send instead read/write for proper MinGW support (it's a 4.2BSD standard). Patch by FloDt <flodt8@yahoo.de>
alex
parents:
10199
diff
changeset
|
238 ret = send( fd, http_hdr->buffer, http_hdr->buffer_size, 0 ); |
| 7953 | 239 if( ret!=(int)http_hdr->buffer_size ) { |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
240 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_ErrSendingHTTPRequest); |
| 16417 | 241 goto err_out; |
| 4121 | 242 } |
| 243 | |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
244 http_free( http_hdr ); |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
245 |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
246 return fd; |
| 16417 | 247 err_out: |
| 21535 | 248 if (fd > 0) closesocket(fd); |
| 16417 | 249 http_free(http_hdr); |
|
17777
13b2332c5154
missing url_free when using proxy and connect fails
reimar
parents:
17657
diff
changeset
|
250 if (proxy && server_url) |
|
13b2332c5154
missing url_free when using proxy and connect fails
reimar
parents:
17657
diff
changeset
|
251 url_free(server_url); |
| 16417 | 252 return -1; |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
253 } |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
254 |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
255 HTTP_header_t * |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
256 http_read_response( int fd ) { |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
257 HTTP_header_t *http_hdr; |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
258 char response[BUFFER_SIZE]; |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
259 int i; |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
260 |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
261 http_hdr = http_new_header(); |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
262 if( http_hdr==NULL ) { |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
263 return NULL; |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
264 } |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
265 |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
266 do { |
|
10206
35e306346e59
Using recv/send instead read/write for proper MinGW support (it's a 4.2BSD standard). Patch by FloDt <flodt8@yahoo.de>
alex
parents:
10199
diff
changeset
|
267 i = recv( fd, response, BUFFER_SIZE, 0 ); |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
268 if( i<0 ) { |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
269 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_ReadFailed); |
| 3365 | 270 http_free( http_hdr ); |
| 271 return NULL; | |
| 272 } | |
| 273 if( i==0 ) { | |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
274 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_Read0CouldBeEOF); |
| 3365 | 275 http_free( http_hdr ); |
| 276 return NULL; | |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
277 } |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
278 http_response_append( http_hdr, response, i ); |
|
2489
0ecc1b4f7cf8
Added ASF http server streaming (Not mms streaming).
bertrand
parents:
2310
diff
changeset
|
279 } while( !http_is_header_entire( http_hdr ) ); |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
280 http_response_parse( http_hdr ); |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
281 return http_hdr; |
| 833 | 282 } |
| 283 | |
| 6555 | 284 int |
| 285 http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry) { | |
| 286 char *aut; | |
| 7953 | 287 |
|
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
288 if( *auth_retry==1 ) { |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
289 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_AuthFailed); |
| 6555 | 290 return -1; |
| 291 } | |
| 292 if( *auth_retry>0 ) { | |
| 293 if( url->username ) { | |
| 294 free( url->username ); | |
| 295 url->username = NULL; | |
| 296 } | |
| 297 if( url->password ) { | |
| 298 free( url->password ); | |
| 299 url->password = NULL; | |
| 300 } | |
| 301 } | |
|
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
302 |
| 6555 | 303 aut = http_get_field(http_hdr, "WWW-Authenticate"); |
| 304 if( aut!=NULL ) { | |
| 305 char *aut_space; | |
| 306 aut_space = strstr(aut, "realm="); | |
| 307 if( aut_space!=NULL ) aut_space += 6; | |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
308 mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_NW_AuthRequiredFor, aut_space); |
| 6555 | 309 } else { |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
310 mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_NW_AuthRequired); |
| 6555 | 311 } |
| 7867 | 312 if( network_username ) { |
| 313 url->username = strdup(network_username); | |
| 6555 | 314 if( url->username==NULL ) { |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
315 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
| 6555 | 316 return -1; |
| 317 } | |
| 318 } else { | |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
319 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_AuthFailed); |
| 6555 | 320 return -1; |
| 321 } | |
| 7867 | 322 if( network_password ) { |
| 323 url->password = strdup(network_password); | |
|
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
324 if( url->password==NULL ) { |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
325 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
|
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
326 return -1; |
|
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
327 } |
|
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
328 } else { |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
329 mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_NW_NoPasswdProvidedTryingBlank); |
|
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
330 } |
| 6555 | 331 (*auth_retry)++; |
| 332 return 0; | |
| 333 } | |
| 334 | |
| 11965 | 335 int |
| 336 http_seek( stream_t *stream, off_t pos ) { | |
| 337 HTTP_header_t *http_hdr = NULL; | |
| 338 int fd; | |
| 339 if( stream==NULL ) return 0; | |
| 340 | |
| 341 if( stream->fd>0 ) closesocket(stream->fd); // need to reconnect to seek in http-stream | |
| 342 fd = http_send_request( stream->streaming_ctrl->url, pos ); | |
| 343 if( fd<0 ) return 0; | |
| 344 | |
| 345 http_hdr = http_read_response( fd ); | |
| 346 | |
| 347 if( http_hdr==NULL ) return 0; | |
| 348 | |
| 349 switch( http_hdr->status_code ) { | |
| 350 case 200: | |
| 351 case 206: // OK | |
| 352 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") ); | |
| 353 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") ); | |
| 354 if( http_hdr->body_size>0 ) { | |
| 355 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { | |
| 356 http_free( http_hdr ); | |
| 357 return -1; | |
| 358 } | |
| 359 } | |
| 360 break; | |
| 361 default: | |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
362 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_ErrServerReturned, http_hdr->status_code, http_hdr->reason_phrase ); |
| 11965 | 363 close( fd ); |
| 364 fd = -1; | |
| 365 } | |
| 366 stream->fd = fd; | |
| 367 | |
| 368 if( http_hdr ) { | |
| 369 http_free( http_hdr ); | |
| 370 stream->streaming_ctrl->data = NULL; | |
| 371 } | |
| 372 | |
| 373 stream->pos=pos; | |
| 374 | |
| 375 return 1; | |
| 376 } | |
| 377 | |
| 378 | |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
379 int |
| 3042 | 380 streaming_bufferize( streaming_ctrl_t *streaming_ctrl, char *buffer, int size) { |
|
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
381 //printf("streaming_bufferize\n"); |
|
19062
83c3afeab35d
drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents:
18466
diff
changeset
|
382 streaming_ctrl->buffer = malloc(size); |
| 3042 | 383 if( streaming_ctrl->buffer==NULL ) { |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
384 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
| 3042 | 385 return -1; |
| 386 } | |
| 387 memcpy( streaming_ctrl->buffer, buffer, size ); | |
| 388 streaming_ctrl->buffer_size = size; | |
| 3599 | 389 return size; |
| 3042 | 390 } |
| 391 | |
| 392 int | |
| 393 nop_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl ) { | |
| 394 int len=0; | |
| 395 //printf("nop_streaming_read\n"); | |
| 396 if( stream_ctrl->buffer_size!=0 ) { | |
| 397 int buffer_len = stream_ctrl->buffer_size-stream_ctrl->buffer_pos; | |
|
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
398 //printf("%d bytes in buffer\n", stream_ctrl->buffer_size); |
| 3042 | 399 len = (size<buffer_len)?size:buffer_len; |
| 400 memcpy( buffer, (stream_ctrl->buffer)+(stream_ctrl->buffer_pos), len ); | |
| 401 stream_ctrl->buffer_pos += len; | |
|
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
402 //printf("buffer_pos = %d\n", stream_ctrl->buffer_pos ); |
| 3042 | 403 if( stream_ctrl->buffer_pos>=stream_ctrl->buffer_size ) { |
| 404 free( stream_ctrl->buffer ); | |
| 405 stream_ctrl->buffer = NULL; | |
| 406 stream_ctrl->buffer_size = 0; | |
| 407 stream_ctrl->buffer_pos = 0; | |
|
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
408 //printf("buffer cleaned\n"); |
| 3042 | 409 } |
|
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
410 //printf("read %d bytes from buffer\n", len ); |
| 3042 | 411 } |
| 412 | |
| 413 if( len<size ) { | |
| 3365 | 414 int ret; |
|
10206
35e306346e59
Using recv/send instead read/write for proper MinGW support (it's a 4.2BSD standard). Patch by FloDt <flodt8@yahoo.de>
alex
parents:
10199
diff
changeset
|
415 ret = recv( fd, buffer+len, size-len, 0 ); |
|
3494
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
416 if( ret<0 ) { |
| 5915 | 417 mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_read error : %s\n",strerror(errno)); |
| 3365 | 418 } |
| 419 len += ret; | |
| 3042 | 420 //printf("read %d bytes from network\n", len ); |
| 421 } | |
| 422 | |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
423 return len; |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
424 } |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
425 |
|
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
426 int |
| 3042 | 427 nop_streaming_seek( int fd, off_t pos, streaming_ctrl_t *stream_ctrl ) { |
| 428 return -1; | |
| 7953 | 429 // To shut up gcc warning |
| 430 fd++; | |
| 431 pos++; | |
| 432 stream_ctrl=NULL; | |
| 3042 | 433 } |
| 434 | |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
435 |
| 15954 | 436 void fixup_network_stream_cache(stream_t *stream) { |
| 15585 | 437 if(stream->streaming_ctrl->buffering) { |
| 438 if(stream_cache_size<0) { | |
| 439 // cache option not set, will use our computed value. | |
| 440 // buffer in KBytes, *5 because the prefill is 20% of the buffer. | |
| 441 stream_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5; | |
| 442 if( stream_cache_size<64 ) stream_cache_size = 64; // 16KBytes min buffer | |
| 443 } | |
|
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
444 mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_NW_CacheSizeSetTo, stream_cache_size); |
| 15585 | 445 } |
| 9922 | 446 } |
| 447 | |
| 448 | |
| 903 | 449 int |
| 3042 | 450 streaming_stop( stream_t *stream ) { |
| 451 stream->streaming_ctrl->status = streaming_stopped_e; | |
|
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
452 return 0; |
| 903 | 453 } |
