Mercurial > mplayer.hg
annotate stream/network.c @ 31568:476ca8c5dbd0
Fix outdated -vo gl usage example.
author | reimar |
---|---|
date | Mon, 05 Jul 2010 19:22:52 +0000 |
parents | 13ca93203358 |
children | 4c973cb80fa5 |
rev | line source |
---|---|
903 | 1 /* |
2 * Network layer for MPlayer | |
30426
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
3 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
4 * Copyright (C) 2001 Bertrand Baudet <bertrand_baudet@yahoo.com> |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
5 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
6 * This file is part of MPlayer. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
7 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
8 * MPlayer is free software; you can redistribute it and/or modify |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
9 * it under the terms of the GNU General Public License as published by |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
10 * the Free Software Foundation; either version 2 of the License, or |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
11 * (at your option) any later version. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
12 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
13 * MPlayer is distributed in the hope that it will be useful, |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
16 * GNU General Public License for more details. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
17 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
18 * You should have received a copy of the GNU General Public License along |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
19 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
29263
diff
changeset
|
20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
903 | 21 */ |
22 | |
1028 | 23 //#define DUMP2FILE |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
24 |
1430 | 25 #include <stdio.h> |
26 #include <stdlib.h> | |
27 #include <string.h> | |
833 | 28 #include <unistd.h> |
1430 | 29 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
30 #include <errno.h> |
903 | 31 #include <ctype.h> |
833 | 32 |
2555
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2489
diff
changeset
|
33 #include "config.h" |
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2489
diff
changeset
|
34 |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
35 #include "mp_msg.h" |
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
36 #include "help_mp.h" |
27472
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
37 |
28402 | 38 #if HAVE_WINSOCK2_H |
27472
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
39 #include <winsock2.h> |
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
40 #include <ws2tcpip.h> |
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
41 #endif |
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
42 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
43 #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
|
44 #include "libmpdemux/demuxer.h" |
17012 | 45 #include "m_config.h" |
31511
13ca93203358
Factorize MPlayer/MEncoder version string handling.
diego
parents:
31500
diff
changeset
|
46 #include "mpcommon.h" |
841 | 47 #include "network.h" |
19335
2a9d669e5ff6
isolated tcp socket code from network.c to a dedicated file
ben
parents:
19331
diff
changeset
|
48 #include "tcp.h" |
903 | 49 #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
|
50 #include "cookies.h" |
903 | 51 #include "url.h" |
841 | 52 |
7867 | 53 extern int stream_cache_size; |
4121 | 54 |
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
|
55 /* 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
|
56 -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
|
57 |
7867 | 58 char *network_username=NULL; |
59 char *network_password=NULL; | |
60 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
|
61 int network_cookies_enabled = 0; |
11228 | 62 char *network_useragent=NULL; |
31222
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
63 char *network_referrer=NULL; |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
64 |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
65 /* IPv6 options */ |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
66 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
|
67 |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
68 |
25246 | 69 const mime_struct_t mime_type_table[] = { |
30475
9f36eccc490a
Prefer libavformat over our own mov demuxer also for video/quicktime
reimar
parents:
30426
diff
changeset
|
70 #ifdef CONFIG_LIBAVFORMAT |
9f36eccc490a
Prefer libavformat over our own mov demuxer also for video/quicktime
reimar
parents:
30426
diff
changeset
|
71 // Flash Video |
9f36eccc490a
Prefer libavformat over our own mov demuxer also for video/quicktime
reimar
parents:
30426
diff
changeset
|
72 { "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED}, |
30621
300fd6ee0f8b
Fix mov reference files: for video/quicktime mime do not force a demuxer
reimar
parents:
30557
diff
changeset
|
73 // do not force any demuxer in this case! |
300fd6ee0f8b
Fix mov reference files: for video/quicktime mime do not force a demuxer
reimar
parents:
30557
diff
changeset
|
74 // we want the lavf demuxer to be tried first (happens automatically anyway), |
300fd6ee0f8b
Fix mov reference files: for video/quicktime mime do not force a demuxer
reimar
parents:
30557
diff
changeset
|
75 // but for mov reference files to work we must also try |
300fd6ee0f8b
Fix mov reference files: for video/quicktime mime do not force a demuxer
reimar
parents:
30557
diff
changeset
|
76 // the native demuxer if lavf fails. |
300fd6ee0f8b
Fix mov reference files: for video/quicktime mime do not force a demuxer
reimar
parents:
30557
diff
changeset
|
77 { "video/quicktime", 0 }, |
30475
9f36eccc490a
Prefer libavformat over our own mov demuxer also for video/quicktime
reimar
parents:
30426
diff
changeset
|
78 #endif |
3042 | 79 // 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
|
80 { "audio/mpeg", DEMUXER_TYPE_AUDIO }, |
3042 | 81 // 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
|
82 { "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
|
83 { "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
|
84 { "video/x-mpeg2", DEMUXER_TYPE_UNKNOWN }, |
3042 | 85 // AVI ??? => video/x-msvideo |
86 { "video/x-msvideo", DEMUXER_TYPE_AVI }, | |
87 // MOV => video/quicktime | |
88 { "video/quicktime", DEMUXER_TYPE_MOV }, | |
89 // ASF | |
90 { "audio/x-ms-wax", DEMUXER_TYPE_ASF }, | |
91 { "audio/x-ms-wma", DEMUXER_TYPE_ASF }, | |
92 { "video/x-ms-asf", DEMUXER_TYPE_ASF }, | |
93 { "video/x-ms-afs", DEMUXER_TYPE_ASF }, | |
94 { "video/x-ms-wmv", DEMUXER_TYPE_ASF }, | |
95 { "video/x-ms-wma", DEMUXER_TYPE_ASF }, | |
17235 | 96 { "application/x-mms-framed", DEMUXER_TYPE_ASF }, |
17657
f5f4200785fc
More complete ASF MIME detection, closing bug# 248,
gpoirier
parents:
17566
diff
changeset
|
97 { "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
|
98 { "application/octet-stream", DEMUXER_TYPE_UNKNOWN }, |
4783 | 99 // Playlists |
7393 | 100 { "video/x-ms-wmx", DEMUXER_TYPE_PLAYLIST }, |
23675
c056ed2819e8
wvx files (mimetype video/x-ms-wvx) are asx playlists. Fix bugzilla #750
rtogni
parents:
22142
diff
changeset
|
101 { "video/x-ms-wvx", DEMUXER_TYPE_PLAYLIST }, |
4783 | 102 { "audio/x-scpls", DEMUXER_TYPE_PLAYLIST }, |
103 { "audio/x-mpegurl", DEMUXER_TYPE_PLAYLIST }, | |
6032 | 104 { "audio/x-pls", DEMUXER_TYPE_PLAYLIST }, |
105 // Real Media | |
15209
b9c199dd123f
Do not force real demuxer on x-pn-realaudio mimetype
rtognimp
parents:
14720
diff
changeset
|
106 // { "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
|
107 // OGG Streaming |
12175 | 108 { "application/x-ogg", DEMUXER_TYPE_OGG }, |
109 // NullSoft Streaming Video | |
12477
1550ef7117c4
Add detection of nsa streamed by aol ultravox server
rtognimp
parents:
12390
diff
changeset
|
110 { "video/nsv", DEMUXER_TYPE_NSV}, |
15585 | 111 { "misc/ultravox", DEMUXER_TYPE_NSV}, |
112 { NULL, DEMUXER_TYPE_UNKNOWN}, | |
3042 | 113 }; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
114 |
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 streaming_ctrl_t * |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17235
diff
changeset
|
117 streaming_ctrl_new(void) { |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
118 streaming_ctrl_t *streaming_ctrl; |
19062
83c3afeab35d
drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents:
18466
diff
changeset
|
119 streaming_ctrl = malloc(sizeof(streaming_ctrl_t)); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
120 if( streaming_ctrl==NULL ) { |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
121 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
122 return NULL; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
123 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
124 memset( streaming_ctrl, 0, sizeof(streaming_ctrl_t) ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
125 return streaming_ctrl; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
126 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
127 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
128 void |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
129 streaming_ctrl_free( streaming_ctrl_t *streaming_ctrl ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
130 if( streaming_ctrl==NULL ) return; |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
131 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
|
132 if( streaming_ctrl->buffer ) free( streaming_ctrl->buffer ); |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
133 if( streaming_ctrl->data ) free( streaming_ctrl->data ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
134 free( streaming_ctrl ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
135 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
136 |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
137 URL_t* |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
138 check4proxies( URL_t *url ) { |
4652 | 139 URL_t *url_out = NULL; |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
140 if( url==NULL ) return NULL; |
4652 | 141 url_out = url_new( url->url ); |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
142 if( !strcasecmp(url->protocol, "http_proxy") ) { |
5915 | 143 mp_msg(MSGT_NETWORK,MSGL_V,"Using HTTP proxy: http://%s:%d\n", url->hostname, url->port ); |
4652 | 144 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
145 } |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
146 // Check if the http_proxy environment variable is set. |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
147 if( !strcasecmp(url->protocol, "http") ) { |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
148 char *proxy; |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
149 proxy = getenv("http_proxy"); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
150 if( proxy!=NULL ) { |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
151 // We got a proxy, build the URL to use it |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
152 int len; |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
153 char *new_url; |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
154 URL_t *tmp_url; |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
155 URL_t *proxy_url = url_new( proxy ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
156 |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
157 if( proxy_url==NULL ) { |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
158 mp_msg(MSGT_NETWORK,MSGL_WARN, |
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
159 MSGTR_MPDEMUX_NW_InvalidProxySettingTryingWithout); |
4652 | 160 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
161 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
162 |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
163 #ifdef HAVE_AF_INET6 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
164 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
|
165 mp_msg(MSGT_NETWORK,MSGL_WARN, |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
166 MSGTR_MPDEMUX_NW_CantResolvTryingWithoutProxy); |
16419 | 167 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
|
168 return url_out; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
169 } |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
170 #endif |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
171 |
5915 | 172 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
|
173 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
|
174 new_url = malloc( len+1 ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
175 if( new_url==NULL ) { |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
176 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
16419 | 177 url_free(proxy_url); |
4652 | 178 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
179 } |
5915 | 180 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
|
181 tmp_url = url_new( new_url ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
182 if( tmp_url==NULL ) { |
16419 | 183 free( new_url ); |
184 url_free( proxy_url ); | |
4652 | 185 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
186 } |
4652 | 187 url_free( url_out ); |
188 url_out = tmp_url; | |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
189 free( new_url ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
190 url_free( proxy_url ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
191 } |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
192 } |
4652 | 193 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
194 } |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
195 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
196 int |
11965 | 197 http_send_request( URL_t *url, off_t pos ) { |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
198 HTTP_header_t *http_hdr; |
4121 | 199 URL_t *server_url; |
11228 | 200 char str[256]; |
21535 | 201 int fd = -1; |
4121 | 202 int ret; |
203 int proxy = 0; // Boolean | |
204 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
205 http_hdr = http_new_header(); |
4121 | 206 |
4145 | 207 if( !strcasecmp(url->protocol, "http_proxy") ) { |
4121 | 208 proxy = 1; |
209 server_url = url_new( (url->file)+1 ); | |
210 http_set_uri( http_hdr, server_url->url ); | |
211 } else { | |
212 server_url = url; | |
213 http_set_uri( http_hdr, server_url->file ); | |
214 } | |
12638
2ebd553876c8
RFC compliance patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
12610
diff
changeset
|
215 if (server_url->port && server_url->port != 80) |
2ebd553876c8
RFC compliance patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
12610
diff
changeset
|
216 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
|
217 else |
2ebd553876c8
RFC compliance patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
12610
diff
changeset
|
218 snprintf(str, 256, "Host: %s", server_url->hostname ); |
3585 | 219 http_set_field( http_hdr, str); |
11228 | 220 if (network_useragent) |
221 snprintf(str, 256, "User-Agent: %s", network_useragent); | |
222 else | |
31511
13ca93203358
Factorize MPlayer/MEncoder version string handling.
diego
parents:
31500
diff
changeset
|
223 snprintf(str, 256, "User-Agent: %s", mplayer_version); |
13ca93203358
Factorize MPlayer/MEncoder version string handling.
diego
parents:
31500
diff
changeset
|
224 http_set_field(http_hdr, str); |
11965 | 225 |
31222
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
226 if (network_referrer) { |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
227 char *referrer = NULL; |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
228 size_t len = strlen(network_referrer) + 10; |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
229 |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
230 // Check len to ensure we don't do something really bad in case of an overflow |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
231 if (len > 10) |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
232 referrer = malloc(len); |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
233 |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
234 if (referrer == NULL) { |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
235 mp_msg(MSGT_NETWORK, MSGL_FATAL, MSGTR_MemAllocFailed); |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
236 } else { |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
237 snprintf(referrer, len, "Referer: %s", network_referrer); |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
238 http_set_field(http_hdr, referrer); |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
239 free(referrer); |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
240 } |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
241 } |
d739cbeb0e38
Add a referrer option to set the HTTP Referer field.
reimar
parents:
30909
diff
changeset
|
242 |
27847
28deb37052cd
Add a noicyx:// protocol to allow easier testing for misconfigured servers.
reimar
parents:
27473
diff
changeset
|
243 if( strcasecmp(url->protocol, "noicyx") ) |
27848 | 244 http_set_field(http_hdr, "Icy-MetaData: 1"); |
16013 | 245 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
246 if(pos>0) { |
11965 | 247 // 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
|
248 snprintf(str, 256, "Range: bytes=%"PRId64"-", (int64_t)pos); |
11965 | 249 http_set_field(http_hdr, str); |
250 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
251 |
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
|
252 if (network_cookies_enabled) cookies_set( http_hdr, server_url->hostname, server_url->url ); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
253 |
12352 | 254 http_set_field( http_hdr, "Connection: close"); |
6515 | 255 http_add_basic_authentication( http_hdr, url->username, url->password ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
256 if( http_build_request( http_hdr )==NULL ) { |
16417 | 257 goto err_out; |
833 | 258 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
259 |
4121 | 260 if( proxy ) { |
261 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
|
262 fd = connect2Server( url->hostname, url->port,1 ); |
4121 | 263 url_free( server_url ); |
17777
13b2332c5154
missing url_free when using proxy and connect fails
reimar
parents:
17657
diff
changeset
|
264 server_url = NULL; |
4121 | 265 } else { |
266 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
|
267 fd = connect2Server( server_url->hostname, server_url->port,1 ); |
4121 | 268 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
269 if( fd<0 ) { |
16417 | 270 goto err_out; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
271 } |
5915 | 272 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Request: [%s]\n", http_hdr->buffer ); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
273 |
31500 | 274 ret = send( fd, http_hdr->buffer, http_hdr->buffer_size, DEFAULT_SEND_FLAGS ); |
7953 | 275 if( ret!=(int)http_hdr->buffer_size ) { |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
276 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_ErrSendingHTTPRequest); |
16417 | 277 goto err_out; |
4121 | 278 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
279 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
280 http_free( http_hdr ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
281 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
282 return fd; |
16417 | 283 err_out: |
21535 | 284 if (fd > 0) closesocket(fd); |
16417 | 285 http_free(http_hdr); |
17777
13b2332c5154
missing url_free when using proxy and connect fails
reimar
parents:
17657
diff
changeset
|
286 if (proxy && server_url) |
13b2332c5154
missing url_free when using proxy and connect fails
reimar
parents:
17657
diff
changeset
|
287 url_free(server_url); |
16417 | 288 return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
289 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
290 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
291 HTTP_header_t * |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
292 http_read_response( int fd ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
293 HTTP_header_t *http_hdr; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
294 char response[BUFFER_SIZE]; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
295 int i; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
296 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
297 http_hdr = http_new_header(); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
298 if( http_hdr==NULL ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
299 return NULL; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
300 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
301 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
302 do { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
303 i = recv( fd, response, BUFFER_SIZE, 0 ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
304 if( i<0 ) { |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
305 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_ReadFailed); |
3365 | 306 http_free( http_hdr ); |
307 return NULL; | |
308 } | |
309 if( i==0 ) { | |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
310 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_Read0CouldBeEOF); |
3365 | 311 http_free( http_hdr ); |
312 return NULL; | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
313 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
314 http_response_append( http_hdr, response, i ); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
315 } while( !http_is_header_entire( http_hdr ) ); |
30909
0d0f53c47bd8
Make http_read_response fail if parsing the response failed.
reimar
parents:
30723
diff
changeset
|
316 if (http_response_parse( http_hdr ) < 0) { |
0d0f53c47bd8
Make http_read_response fail if parsing the response failed.
reimar
parents:
30723
diff
changeset
|
317 http_free( http_hdr ); |
0d0f53c47bd8
Make http_read_response fail if parsing the response failed.
reimar
parents:
30723
diff
changeset
|
318 return NULL; |
0d0f53c47bd8
Make http_read_response fail if parsing the response failed.
reimar
parents:
30723
diff
changeset
|
319 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
320 return http_hdr; |
833 | 321 } |
322 | |
6555 | 323 int |
324 http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry) { | |
325 char *aut; | |
7953 | 326 |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
327 if( *auth_retry==1 ) { |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
328 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_AuthFailed); |
6555 | 329 return -1; |
330 } | |
331 if( *auth_retry>0 ) { | |
332 if( url->username ) { | |
333 free( url->username ); | |
334 url->username = NULL; | |
335 } | |
336 if( url->password ) { | |
337 free( url->password ); | |
338 url->password = NULL; | |
339 } | |
340 } | |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
341 |
6555 | 342 aut = http_get_field(http_hdr, "WWW-Authenticate"); |
343 if( aut!=NULL ) { | |
344 char *aut_space; | |
345 aut_space = strstr(aut, "realm="); | |
346 if( aut_space!=NULL ) aut_space += 6; | |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
347 mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_NW_AuthRequiredFor, aut_space); |
6555 | 348 } else { |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
349 mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_NW_AuthRequired); |
6555 | 350 } |
7867 | 351 if( network_username ) { |
352 url->username = strdup(network_username); | |
6555 | 353 if( url->username==NULL ) { |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
354 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
6555 | 355 return -1; |
356 } | |
357 } else { | |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
358 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_AuthFailed); |
6555 | 359 return -1; |
360 } | |
7867 | 361 if( network_password ) { |
362 url->password = strdup(network_password); | |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
363 if( url->password==NULL ) { |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
364 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
|
365 return -1; |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
366 } |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
367 } else { |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
368 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
|
369 } |
6555 | 370 (*auth_retry)++; |
371 return 0; | |
372 } | |
373 | |
11965 | 374 int |
375 http_seek( stream_t *stream, off_t pos ) { | |
376 HTTP_header_t *http_hdr = NULL; | |
377 int fd; | |
378 if( stream==NULL ) return 0; | |
379 | |
380 if( stream->fd>0 ) closesocket(stream->fd); // need to reconnect to seek in http-stream | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
381 fd = http_send_request( stream->streaming_ctrl->url, pos ); |
11965 | 382 if( fd<0 ) return 0; |
383 | |
384 http_hdr = http_read_response( fd ); | |
385 | |
386 if( http_hdr==NULL ) return 0; | |
387 | |
30628
5fd3ea86cf0d
Print response headers as debugging output also for HTTP seeks.
reimar
parents:
30627
diff
changeset
|
388 if( mp_msg_test(MSGT_NETWORK,MSGL_V) ) |
5fd3ea86cf0d
Print response headers as debugging output also for HTTP seeks.
reimar
parents:
30627
diff
changeset
|
389 http_debug_hdr( http_hdr ); |
5fd3ea86cf0d
Print response headers as debugging output also for HTTP seeks.
reimar
parents:
30627
diff
changeset
|
390 |
11965 | 391 switch( http_hdr->status_code ) { |
392 case 200: | |
393 case 206: // OK | |
394 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") ); | |
395 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") ); | |
396 if( http_hdr->body_size>0 ) { | |
397 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { | |
398 http_free( http_hdr ); | |
399 return -1; | |
400 } | |
401 } | |
402 break; | |
403 default: | |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
404 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_ErrServerReturned, http_hdr->status_code, http_hdr->reason_phrase ); |
30627 | 405 closesocket( fd ); |
11965 | 406 fd = -1; |
407 } | |
408 stream->fd = fd; | |
409 | |
410 if( http_hdr ) { | |
411 http_free( http_hdr ); | |
412 stream->streaming_ctrl->data = NULL; | |
413 } | |
414 | |
415 stream->pos=pos; | |
416 | |
417 return 1; | |
418 } | |
419 | |
420 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
421 int |
3042 | 422 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
|
423 //printf("streaming_bufferize\n"); |
19062
83c3afeab35d
drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents:
18466
diff
changeset
|
424 streaming_ctrl->buffer = malloc(size); |
3042 | 425 if( streaming_ctrl->buffer==NULL ) { |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
426 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed); |
3042 | 427 return -1; |
428 } | |
429 memcpy( streaming_ctrl->buffer, buffer, size ); | |
430 streaming_ctrl->buffer_size = size; | |
3599 | 431 return size; |
3042 | 432 } |
433 | |
434 int | |
435 nop_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl ) { | |
436 int len=0; | |
437 //printf("nop_streaming_read\n"); | |
438 if( stream_ctrl->buffer_size!=0 ) { | |
439 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
|
440 //printf("%d bytes in buffer\n", stream_ctrl->buffer_size); |
3042 | 441 len = (size<buffer_len)?size:buffer_len; |
442 memcpy( buffer, (stream_ctrl->buffer)+(stream_ctrl->buffer_pos), len ); | |
443 stream_ctrl->buffer_pos += len; | |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
444 //printf("buffer_pos = %d\n", stream_ctrl->buffer_pos ); |
3042 | 445 if( stream_ctrl->buffer_pos>=stream_ctrl->buffer_size ) { |
446 free( stream_ctrl->buffer ); | |
447 stream_ctrl->buffer = NULL; | |
448 stream_ctrl->buffer_size = 0; | |
449 stream_ctrl->buffer_pos = 0; | |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
450 //printf("buffer cleaned\n"); |
3042 | 451 } |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
452 //printf("read %d bytes from buffer\n", len ); |
3042 | 453 } |
454 | |
455 if( len<size ) { | |
3365 | 456 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
|
457 ret = recv( fd, buffer+len, size-len, 0 ); |
3494
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
458 if( ret<0 ) { |
5915 | 459 mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_read error : %s\n",strerror(errno)); |
3365 | 460 } |
461 len += ret; | |
3042 | 462 //printf("read %d bytes from network\n", len ); |
463 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
464 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
465 return len; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
466 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
467 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
468 int |
3042 | 469 nop_streaming_seek( int fd, off_t pos, streaming_ctrl_t *stream_ctrl ) { |
470 return -1; | |
7953 | 471 // To shut up gcc warning |
472 fd++; | |
473 pos++; | |
474 stream_ctrl=NULL; | |
3042 | 475 } |
476 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
477 |
15954 | 478 void fixup_network_stream_cache(stream_t *stream) { |
15585 | 479 if(stream->streaming_ctrl->buffering) { |
480 if(stream_cache_size<0) { | |
481 // cache option not set, will use our computed value. | |
482 // buffer in KBytes, *5 because the prefill is 20% of the buffer. | |
483 stream_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5; | |
484 if( stream_cache_size<64 ) stream_cache_size = 64; // 16KBytes min buffer | |
485 } | |
17153
c0b147bdf49d
Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents:
17012
diff
changeset
|
486 mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_NW_CacheSizeSetTo, stream_cache_size); |
15585 | 487 } |
9922 | 488 } |
489 |