Mercurial > mplayer.hg
annotate libmpdemux/network.c @ 12011:15fc081c071c
--disable-xmms option was missing, noticed by Enrico Weigelt.
author | diego |
---|---|
date | Fri, 05 Mar 2004 04:44:32 +0000 |
parents | 3d75bcc28231 |
children | 2c2fb4457982 |
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 |
10281 | 19 #ifndef HAVE_WINSOCK2 |
20 #define closesocket close | |
21 #else | |
22 #include <winsock2.h> | |
23 #include <ws2tcpip.h> | |
24 #endif | |
25 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
26 #include "stream.h" |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
27 #include "demuxer.h" |
9749 | 28 #include "../m_config.h" |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
29 |
841 | 30 #include "network.h" |
903 | 31 #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
|
32 #include "cookies.h" |
903 | 33 #include "url.h" |
34 #include "asf.h" | |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
35 #ifndef STREAMING_LIVE_DOT_COM |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
36 #include "rtp.h" |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
37 #endif |
8570 | 38 #include "pnm.h" |
9922 | 39 #include "realrtsp/rtsp_session.h" |
841 | 40 |
6466 | 41 #include "../version.h" |
42 | |
4121 | 43 extern int verbose; |
7867 | 44 extern int stream_cache_size; |
4121 | 45 |
7862
013c255225d8
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents:
7513
diff
changeset
|
46 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
|
47 |
9749 | 48 int asf_streaming_start( stream_t *stream, int *demuxer_type ); |
7953 | 49 int rtsp_streaming_start( stream_t *stream ); |
50 | |
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 /* 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
|
52 -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
|
53 |
7867 | 54 char *network_username=NULL; |
55 char *network_password=NULL; | |
56 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
|
57 int network_cookies_enabled = 0; |
11228 | 58 char *network_useragent=NULL; |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
59 |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
60 /* IPv6 options */ |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
61 int network_prefer_ipv4 = 0; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
62 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
|
63 |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
64 |
3042 | 65 static struct { |
66 char *mime_type; | |
67 int demuxer_type; | |
68 } mime_type_table[] = { | |
69 // 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
|
70 { "audio/mpeg", DEMUXER_TYPE_AUDIO }, |
3042 | 71 // MPEG streaming |
72 { "video/mpeg", DEMUXER_TYPE_MPEG_PS }, | |
6032 | 73 { "video/x-mpeg", DEMUXER_TYPE_MPEG_PS }, |
74 { "video/x-mpeg2", DEMUXER_TYPE_MPEG_PS }, | |
3042 | 75 // AVI ??? => video/x-msvideo |
76 { "video/x-msvideo", DEMUXER_TYPE_AVI }, | |
77 // MOV => video/quicktime | |
78 { "video/quicktime", DEMUXER_TYPE_MOV }, | |
79 // ASF | |
80 { "audio/x-ms-wax", DEMUXER_TYPE_ASF }, | |
81 { "audio/x-ms-wma", DEMUXER_TYPE_ASF }, | |
82 { "video/x-ms-asf", DEMUXER_TYPE_ASF }, | |
83 { "video/x-ms-afs", DEMUXER_TYPE_ASF }, | |
84 { "video/x-ms-wvx", DEMUXER_TYPE_ASF }, | |
85 { "video/x-ms-wmv", DEMUXER_TYPE_ASF }, | |
86 { "video/x-ms-wma", DEMUXER_TYPE_ASF }, | |
4783 | 87 // Playlists |
7393 | 88 { "video/x-ms-wmx", DEMUXER_TYPE_PLAYLIST }, |
4783 | 89 { "audio/x-scpls", DEMUXER_TYPE_PLAYLIST }, |
90 { "audio/x-mpegurl", DEMUXER_TYPE_PLAYLIST }, | |
6032 | 91 { "audio/x-pls", DEMUXER_TYPE_PLAYLIST }, |
92 // Real Media | |
8114
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
93 { "audio/x-pn-realaudio", DEMUXER_TYPE_REAL }, |
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
94 // OGG Streaming |
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
95 { "application/x-ogg", DEMUXER_TYPE_OGG } |
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
96 |
3042 | 97 }; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
98 |
8890
c9cbfb9d720c
Finally commented out the code for autodetection based on the extension.
bertrand
parents:
8824
diff
changeset
|
99 /* |
c9cbfb9d720c
Finally commented out the code for autodetection based on the extension.
bertrand
parents:
8824
diff
changeset
|
100 * An autodetection based on the extension is not a good idea. |
c9cbfb9d720c
Finally commented out the code for autodetection based on the extension.
bertrand
parents:
8824
diff
changeset
|
101 * |
3042 | 102 static struct { |
103 char *extension; | |
104 int demuxer_type; | |
105 } extensions_table[] = { | |
106 { "mpeg", DEMUXER_TYPE_MPEG_PS }, | |
107 { "mpg", DEMUXER_TYPE_MPEG_PS }, | |
3072 | 108 { "mpe", DEMUXER_TYPE_MPEG_ES }, |
3042 | 109 { "avi", DEMUXER_TYPE_AVI }, |
110 { "mov", DEMUXER_TYPE_MOV }, | |
3072 | 111 { "qt", DEMUXER_TYPE_MOV }, |
3042 | 112 { "asx", DEMUXER_TYPE_ASF }, |
113 { "asf", DEMUXER_TYPE_ASF }, | |
114 { "wmv", DEMUXER_TYPE_ASF }, | |
115 { "wma", DEMUXER_TYPE_ASF }, | |
3072 | 116 { "viv", DEMUXER_TYPE_VIVO }, |
4236 | 117 { "rm", DEMUXER_TYPE_REAL }, |
6032 | 118 { "ra", DEMUXER_TYPE_REAL }, |
4236 | 119 { "y4m", DEMUXER_TYPE_Y4M }, |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
120 { "mp3", DEMUXER_TYPE_AUDIO }, |
8114
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
121 { "ogg", DEMUXER_TYPE_OGG }, |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
122 { "wav", DEMUXER_TYPE_AUDIO }, |
4783 | 123 { "pls", DEMUXER_TYPE_PLAYLIST }, |
124 { "m3u", DEMUXER_TYPE_PLAYLIST } | |
3042 | 125 }; |
8890
c9cbfb9d720c
Finally commented out the code for autodetection based on the extension.
bertrand
parents:
8824
diff
changeset
|
126 */ |
999
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 streaming_ctrl_t * |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
129 streaming_ctrl_new( ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
130 streaming_ctrl_t *streaming_ctrl; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
131 streaming_ctrl = (streaming_ctrl_t*)malloc(sizeof(streaming_ctrl_t)); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
132 if( streaming_ctrl==NULL ) { |
5915 | 133 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Failed to allocate memory\n"); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
134 return NULL; |
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 memset( streaming_ctrl, 0, sizeof(streaming_ctrl_t) ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
137 return streaming_ctrl; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
138 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
139 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
140 void |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
141 streaming_ctrl_free( streaming_ctrl_t *streaming_ctrl ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
142 if( streaming_ctrl==NULL ) return; |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
143 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
|
144 if( streaming_ctrl->buffer ) free( streaming_ctrl->buffer ); |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
145 if( streaming_ctrl->data ) free( streaming_ctrl->data ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
146 free( streaming_ctrl ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
147 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
148 |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
149 #ifndef STREAMING_LIVE_DOT_COM |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
150 int |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
151 read_rtp_from_server(int fd, char *buffer, int length) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
152 struct rtpheader rh; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
153 char *data; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
154 int len; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
155 static int got_first = 0; |
4553
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
156 static unsigned short sequence; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
157 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
158 if( buffer==NULL || length<0 ) return -1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
159 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
160 getrtp2(fd, &rh, &data, &len); |
4553
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
161 if( got_first && rh.b.sequence != (unsigned short)(sequence+1) ) |
5915 | 162 mp_msg(MSGT_NETWORK,MSGL_ERR,"RTP packet sequence error! Expected: %d, received: %d\n", |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
163 sequence+1, rh.b.sequence); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
164 got_first = 1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
165 sequence = rh.b.sequence; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
166 memcpy(buffer, data, len); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
167 return(len); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
168 } |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
169 #endif |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
170 |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
171 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
172 // Converts an address family constant to a string |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
173 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
174 char *af2String(int af) { |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
175 switch (af) { |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
176 case AF_INET: return "AF_INET"; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
177 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
178 #ifdef HAVE_AF_INET6 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
179 case AF_INET6: return "AF_INET6"; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
180 #endif |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
181 default: return "Unknown address family!"; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
182 } |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
183 } |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
184 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
185 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
186 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
187 // Connect to a server using a TCP connection, with specified address family |
7251
cc83ad6af513
Return -2 for fatal error while connecting to a server.
bertrand
parents:
7007
diff
changeset
|
188 // return -2 for fatal error, like unable to resolve name, connection timeout... |
cc83ad6af513
Return -2 for fatal error while connecting to a server.
bertrand
parents:
7007
diff
changeset
|
189 // return -1 is unable to connect to a particular port |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
190 |
833 | 191 int |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
192 connect2Server_with_af(char *host, int port, int af,int verb) { |
833 | 193 int socket_server_fd; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
194 int err, err_len; |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
195 int ret,count = 0; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
196 fd_set set; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
197 struct timeval tv; |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
198 union { |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
199 struct sockaddr_in four; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
200 #ifdef HAVE_AF_INET6 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
201 struct sockaddr_in6 six; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
202 #endif |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
203 } server_address; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
204 size_t server_address_size; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
205 void *our_s_addr; // Pointer to sin_addr or sin6_addr |
7953 | 206 struct hostent *hp=NULL; |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
207 char buf[255]; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
208 |
10281 | 209 #ifdef HAVE_WINSOCK2 |
210 u_long val; | |
211 #endif | |
212 | |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
213 socket_server_fd = socket(af, SOCK_STREAM, 0); |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
214 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
215 |
833 | 216 if( socket_server_fd==-1 ) { |
11227 | 217 // mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to create %s socket:\n", af2String(af)); |
7251
cc83ad6af513
Return -2 for fatal error while connecting to a server.
bertrand
parents:
7007
diff
changeset
|
218 return -2; |
833 | 219 } |
220 | |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
221 switch (af) { |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
222 case AF_INET: our_s_addr = (void *) &server_address.four.sin_addr; break; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
223 #ifdef HAVE_AF_INET6 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
224 case AF_INET6: our_s_addr = (void *) &server_address.six.sin6_addr; break; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
225 #endif |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
226 default: |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
227 mp_msg(MSGT_NETWORK,MSGL_ERR, "Unknown address family %d:\n", af); |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
228 return -2; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
229 } |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
230 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
231 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
232 bzero(&server_address, sizeof(server_address)); |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
233 |
10281 | 234 #ifndef HAVE_WINSOCK2 |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
235 #ifdef USE_ATON |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
236 if (inet_aton(host, our_s_addr)!=1) |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
237 #else |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
238 if (inet_pton(af, host, our_s_addr)!=1) |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
239 #endif |
10281 | 240 #else |
241 if ( inet_addr(host)==INADDR_NONE ) | |
242 #endif | |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
243 { |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
244 if(verb) mp_msg(MSGT_NETWORK,MSGL_STATUS,"Resolving %s for %s...\n", host, af2String(af)); |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
245 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
246 #ifdef HAVE_GETHOSTBYNAME2 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
247 hp=(struct hostent*)gethostbyname2( host, af ); |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
248 #else |
3042 | 249 hp=(struct hostent*)gethostbyname( host ); |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
250 #endif |
841 | 251 if( hp==NULL ) { |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
252 if(verb) mp_msg(MSGT_NETWORK,MSGL_ERR,"Couldn't resolve name for %s: %s\n", af2String(af), host); |
7251
cc83ad6af513
Return -2 for fatal error while connecting to a server.
bertrand
parents:
7007
diff
changeset
|
253 return -2; |
833 | 254 } |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
255 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
256 memcpy( our_s_addr, (void*)hp->h_addr, hp->h_length ); |
833 | 257 } |
10281 | 258 #ifdef HAVE_WINSOCK2 |
259 else { | |
260 unsigned long addr = inet_addr(host); | |
261 memcpy( our_s_addr, (void*)&addr, sizeof(addr) ); | |
262 } | |
263 #endif | |
3042 | 264 |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
265 switch (af) { |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
266 case AF_INET: |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
267 server_address.four.sin_family=af; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
268 server_address.four.sin_port=htons(port); |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
269 server_address_size = sizeof(server_address.four); |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
270 break; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
271 #ifdef HAVE_AF_INET6 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
272 case AF_INET6: |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
273 server_address.six.sin6_family=af; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
274 server_address.six.sin6_port=htons(port); |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
275 server_address_size = sizeof(server_address.six); |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
276 break; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
277 #endif |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
278 default: |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
279 mp_msg(MSGT_NETWORK,MSGL_ERR, "Unknown address family %d:\n", af); |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
280 return -2; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
281 } |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
282 |
10281 | 283 #if defined(USE_ATON) || defined(HAVE_WINSOCK2) |
9900 | 284 strncpy( buf, inet_ntoa( *((struct in_addr*)our_s_addr) ), 255); |
285 #else | |
286 inet_ntop(af, our_s_addr, buf, 255); | |
287 #endif | |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
288 if(verb) mp_msg(MSGT_NETWORK,MSGL_STATUS,"Connecting to server %s[%s]:%d ...\n", host, buf , port ); |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
289 |
3042 | 290 // Turn the socket as non blocking so we can timeout on the connection |
10281 | 291 #ifndef HAVE_WINSOCK2 |
3042 | 292 fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) | O_NONBLOCK ); |
10281 | 293 #else |
294 val = 1; | |
295 ioctlsocket( socket_server_fd, FIONBIO, &val ); | |
296 #endif | |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
297 if( connect( socket_server_fd, (struct sockaddr*)&server_address, server_address_size )==-1 ) { |
10281 | 298 #ifndef HAVE_WINSOCK2 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
299 if( errno!=EINPROGRESS ) { |
10281 | 300 #else |
301 if( (WSAGetLastError() != WSAEINPROGRESS) && (WSAGetLastError() != WSAEWOULDBLOCK) ) { | |
302 #endif | |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
303 if(verb) mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to connect to server with %s\n", af2String(af)); |
10281 | 304 closesocket(socket_server_fd); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
305 return -1; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
306 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
307 } |
6477 | 308 tv.tv_sec = 0; |
309 tv.tv_usec = 500000; | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
310 FD_ZERO( &set ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
311 FD_SET( socket_server_fd, &set ); |
3042 | 312 // When the connection will be made, we will have a writable fd |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
313 while((ret = select(socket_server_fd+1, NULL, &set, NULL, &tv)) == 0) { |
6454 | 314 if( ret<0 ) mp_msg(MSGT_NETWORK,MSGL_ERR,"select failed\n"); |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
315 else if(ret > 0) break; |
7862
013c255225d8
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents:
7513
diff
changeset
|
316 else if(count > 30 || mp_input_check_interrupt(500)) { |
6477 | 317 if(count > 30) |
5915 | 318 mp_msg(MSGT_NETWORK,MSGL_ERR,"Connection timeout\n"); |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
319 else |
5915 | 320 mp_msg(MSGT_NETWORK,MSGL_V,"Connection interuppted by user\n"); |
8824 | 321 return -3; |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
322 } |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
323 count++; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
324 FD_ZERO( &set ); |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
325 FD_SET( socket_server_fd, &set ); |
6477 | 326 tv.tv_sec = 0; |
327 tv.tv_usec = 500000; | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
328 } |
3042 | 329 |
330 // Turn back the socket as blocking | |
10281 | 331 #ifndef HAVE_WINSOCK2 |
3042 | 332 fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) & ~O_NONBLOCK ); |
10281 | 333 #else |
334 val = 0; | |
335 ioctlsocket( socket_server_fd, FIONBIO, &val ); | |
336 #endif | |
3494
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
337 // Check if there were any error |
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
338 err_len = sizeof(int); |
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
339 ret = getsockopt(socket_server_fd,SOL_SOCKET,SO_ERROR,&err,&err_len); |
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
340 if(ret < 0) { |
5915 | 341 mp_msg(MSGT_NETWORK,MSGL_ERR,"getsockopt failed : %s\n",strerror(errno)); |
7251
cc83ad6af513
Return -2 for fatal error while connecting to a server.
bertrand
parents:
7007
diff
changeset
|
342 return -2; |
3494
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
343 } |
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
344 if(err > 0) { |
5915 | 345 mp_msg(MSGT_NETWORK,MSGL_ERR,"Connect error : %s\n",strerror(err)); |
3494
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
346 return -1; |
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
347 } |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
348 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
349 return socket_server_fd; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
350 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
351 |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
352 // Connect to a server using a TCP connection |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
353 // return -2 for fatal error, like unable to resolve name, connection timeout... |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
354 // return -1 is unable to connect to a particular port |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
355 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
356 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
357 int |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
358 connect2Server(char *host, int port, int verb) { |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
359 #ifdef HAVE_AF_INET6 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
360 int r; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
361 int s = -2; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
362 |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
363 r = connect2Server_with_af(host, port, network_prefer_ipv4 ? AF_INET:AF_INET6,verb); |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
364 if (r > -1) return r; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
365 |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
366 s = connect2Server_with_af(host, port, network_prefer_ipv4 ? AF_INET6:AF_INET,verb); |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
367 if (s == -2) return r; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
368 return s; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
369 #else |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
370 return connect2Server_with_af(host, port, AF_INET,verb); |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
371 #endif |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
372 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
373 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
374 } |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
375 |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
376 URL_t* |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
377 check4proxies( URL_t *url ) { |
4652 | 378 URL_t *url_out = NULL; |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
379 if( url==NULL ) return NULL; |
4652 | 380 url_out = url_new( url->url ); |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
381 if( !strcasecmp(url->protocol, "http_proxy") ) { |
5915 | 382 mp_msg(MSGT_NETWORK,MSGL_V,"Using HTTP proxy: http://%s:%d\n", url->hostname, url->port ); |
4652 | 383 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
384 } |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
385 // Check if the http_proxy environment variable is set. |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
386 if( !strcasecmp(url->protocol, "http") ) { |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
387 char *proxy; |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
388 proxy = getenv("http_proxy"); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
389 if( proxy!=NULL ) { |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
390 // We got a proxy, build the URL to use it |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
391 int len; |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
392 char *new_url; |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
393 URL_t *tmp_url; |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
394 URL_t *proxy_url = url_new( proxy ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
395 |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
396 if( proxy_url==NULL ) { |
5915 | 397 mp_msg(MSGT_NETWORK,MSGL_WARN,"Invalid proxy setting...Trying without proxy.\n"); |
4652 | 398 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
399 } |
9691
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
400 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
401 #ifdef HAVE_AF_INET6 |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
402 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
|
403 mp_msg(MSGT_NETWORK,MSGL_WARN, |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
404 "Could not find resolve remote hostname for AF_INET. Trying without proxy.\n"); |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
405 return url_out; |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
406 } |
ed72c158215d
Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents:
8939
diff
changeset
|
407 #endif |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
408 |
5915 | 409 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
|
410 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
|
411 new_url = malloc( len+1 ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
412 if( new_url==NULL ) { |
5915 | 413 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n"); |
4652 | 414 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
415 } |
5915 | 416 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
|
417 tmp_url = url_new( new_url ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
418 if( tmp_url==NULL ) { |
4652 | 419 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
420 } |
4652 | 421 url_free( url_out ); |
422 url_out = tmp_url; | |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
423 free( new_url ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
424 url_free( proxy_url ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
425 } |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
426 } |
4652 | 427 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
428 } |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
429 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
430 int |
11965 | 431 http_send_request( URL_t *url, off_t pos ) { |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
432 HTTP_header_t *http_hdr; |
4121 | 433 URL_t *server_url; |
11228 | 434 char str[256]; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
435 int fd; |
4121 | 436 int ret; |
437 int proxy = 0; // Boolean | |
438 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
439 http_hdr = http_new_header(); |
4121 | 440 |
4145 | 441 if( !strcasecmp(url->protocol, "http_proxy") ) { |
4121 | 442 proxy = 1; |
443 server_url = url_new( (url->file)+1 ); | |
444 http_set_uri( http_hdr, server_url->url ); | |
445 } else { | |
446 server_url = url; | |
447 http_set_uri( http_hdr, server_url->file ); | |
448 } | |
11228 | 449 snprintf(str, 256, "Host: %s", server_url->hostname ); |
3585 | 450 http_set_field( http_hdr, str); |
11228 | 451 if (network_useragent) |
452 { | |
453 snprintf(str, 256, "User-Agent: %s", network_useragent); | |
454 http_set_field(http_hdr, str); | |
455 } | |
456 else | |
457 http_set_field( http_hdr, "User-Agent: MPlayer/"VERSION); | |
11965 | 458 |
459 if(pos>0) { | |
460 // Extend http_send_request with possibility to do partial content retrieval | |
461 snprintf(str, 256, "Range: bytes=%d-", pos); | |
462 http_set_field(http_hdr, str); | |
463 } | |
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
|
464 |
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
|
465 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
|
466 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
467 http_set_field( http_hdr, "Connection: closed"); |
6515 | 468 http_add_basic_authentication( http_hdr, url->username, url->password ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
469 if( http_build_request( http_hdr )==NULL ) { |
841 | 470 return -1; |
833 | 471 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
472 |
4121 | 473 if( proxy ) { |
474 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
|
475 fd = connect2Server( url->hostname, url->port,1 ); |
4121 | 476 url_free( server_url ); |
477 } else { | |
478 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
|
479 fd = connect2Server( server_url->hostname, server_url->port,1 ); |
4121 | 480 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
481 if( fd<0 ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
482 return -1; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
483 } |
5915 | 484 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Request: [%s]\n", http_hdr->buffer ); |
4121 | 485 |
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
|
486 ret = send( fd, http_hdr->buffer, http_hdr->buffer_size, 0 ); |
7953 | 487 if( ret!=(int)http_hdr->buffer_size ) { |
5915 | 488 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while sending HTTP request: didn't sent all the request\n"); |
4121 | 489 return -1; |
490 } | |
491 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
492 http_free( http_hdr ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
493 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
494 return fd; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
495 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
496 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
497 HTTP_header_t * |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
498 http_read_response( int fd ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
499 HTTP_header_t *http_hdr; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
500 char response[BUFFER_SIZE]; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
501 int i; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
502 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
503 http_hdr = http_new_header(); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
504 if( http_hdr==NULL ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
505 return NULL; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
506 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
507 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
508 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
|
509 i = recv( fd, response, BUFFER_SIZE, 0 ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
510 if( i<0 ) { |
5915 | 511 mp_msg(MSGT_NETWORK,MSGL_ERR,"Read failed\n"); |
3365 | 512 http_free( http_hdr ); |
513 return NULL; | |
514 } | |
515 if( i==0 ) { | |
5915 | 516 mp_msg(MSGT_NETWORK,MSGL_ERR,"http_read_response read 0 -ie- EOF\n"); |
3365 | 517 http_free( http_hdr ); |
518 return NULL; | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
519 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
520 http_response_append( http_hdr, response, i ); |
2489
0ecc1b4f7cf8
Added ASF http server streaming (Not mms streaming).
bertrand
parents:
2310
diff
changeset
|
521 } while( !http_is_header_entire( http_hdr ) ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
522 http_response_parse( http_hdr ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
523 return http_hdr; |
833 | 524 } |
525 | |
6555 | 526 int |
527 http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry) { | |
528 char *aut; | |
7953 | 529 |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
530 if( *auth_retry==1 ) { |
6555 | 531 mp_msg(MSGT_NETWORK,MSGL_ERR,"Authentication failed\n"); |
6570
52ecfeddf864
Changed the -pass option to -passwd to avoid clash with mencoder option.
bertrand
parents:
6558
diff
changeset
|
532 mp_msg(MSGT_NETWORK,MSGL_ERR,"Please use the option -user and -passwd to provide your username/password for a list of URLs,\n"); |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
533 mp_msg(MSGT_NETWORK,MSGL_ERR,"or form an URL like: http://username:password@hostname/file\n"); |
6555 | 534 return -1; |
535 } | |
536 if( *auth_retry>0 ) { | |
537 if( url->username ) { | |
538 free( url->username ); | |
539 url->username = NULL; | |
540 } | |
541 if( url->password ) { | |
542 free( url->password ); | |
543 url->password = NULL; | |
544 } | |
545 } | |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
546 |
6555 | 547 aut = http_get_field(http_hdr, "WWW-Authenticate"); |
548 if( aut!=NULL ) { | |
549 char *aut_space; | |
550 aut_space = strstr(aut, "realm="); | |
551 if( aut_space!=NULL ) aut_space += 6; | |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
552 mp_msg(MSGT_NETWORK,MSGL_INFO,"Authentication required for %s\n", aut_space); |
6555 | 553 } else { |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
554 mp_msg(MSGT_NETWORK,MSGL_INFO,"Authentication required\n"); |
6555 | 555 } |
7867 | 556 if( network_username ) { |
557 url->username = strdup(network_username); | |
6555 | 558 if( url->username==NULL ) { |
559 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n"); | |
560 return -1; | |
561 } | |
562 } else { | |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
563 mp_msg(MSGT_NETWORK,MSGL_ERR,"Unable to read the username\n"); |
6570
52ecfeddf864
Changed the -pass option to -passwd to avoid clash with mencoder option.
bertrand
parents:
6558
diff
changeset
|
564 mp_msg(MSGT_NETWORK,MSGL_ERR,"Please use the option -user and -passwd to provide your username/password for a list of URLs,\n"); |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
565 mp_msg(MSGT_NETWORK,MSGL_ERR,"or form an URL like: http://username:password@hostname/file\n"); |
6555 | 566 return -1; |
567 } | |
7867 | 568 if( network_password ) { |
569 url->password = strdup(network_password); | |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
570 if( url->password==NULL ) { |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
571 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n"); |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
572 return -1; |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
573 } |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
574 } else { |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
575 mp_msg(MSGT_NETWORK,MSGL_INFO,"No password provided, trying blank password\n"); |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
576 } |
6555 | 577 (*auth_retry)++; |
578 return 0; | |
579 } | |
580 | |
11965 | 581 int |
582 http_seek( stream_t *stream, off_t pos ) { | |
583 HTTP_header_t *http_hdr = NULL; | |
584 int fd; | |
585 if( stream==NULL ) return 0; | |
586 | |
587 if( stream->fd>0 ) closesocket(stream->fd); // need to reconnect to seek in http-stream | |
588 fd = http_send_request( stream->streaming_ctrl->url, pos ); | |
589 if( fd<0 ) return 0; | |
590 | |
591 http_hdr = http_read_response( fd ); | |
592 | |
593 if( http_hdr==NULL ) return 0; | |
594 | |
595 switch( http_hdr->status_code ) { | |
596 case 200: | |
597 case 206: // OK | |
598 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") ); | |
599 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") ); | |
600 if( http_hdr->body_size>0 ) { | |
601 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { | |
602 http_free( http_hdr ); | |
603 return -1; | |
604 } | |
605 } | |
606 break; | |
607 default: | |
608 mp_msg(MSGT_NETWORK,MSGL_ERR,"Server return %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); | |
609 close( fd ); | |
610 fd = -1; | |
611 } | |
612 stream->fd = fd; | |
613 | |
614 if( http_hdr ) { | |
615 http_free( http_hdr ); | |
616 stream->streaming_ctrl->data = NULL; | |
617 } | |
618 | |
619 stream->pos=pos; | |
620 | |
621 return 1; | |
622 } | |
623 | |
624 | |
903 | 625 // By using the protocol, the extension of the file or the content-type |
626 // we might be able to guess the streaming type. | |
627 int | |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
628 autodetectProtocol(streaming_ctrl_t *streaming_ctrl, int *fd_out, int *file_format) { |
903 | 629 HTTP_header_t *http_hdr; |
11505
8de9dba0ffaa
Add detection of Real rtsp when there are queries in url.
rtognimp
parents:
11228
diff
changeset
|
630 unsigned int i; |
903 | 631 int fd=-1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
632 int redirect; |
6516
351790e49eff
Improved the authentication interaction. Still need to replace scanf.
bertrand
parents:
6515
diff
changeset
|
633 int auth_retry=0; |
11965 | 634 int seekable=0; |
903 | 635 char *extension; |
636 char *content_type; | |
637 char *next_url; | |
638 | |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
639 URL_t *url = streaming_ctrl->url; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
640 *file_format = DEMUXER_TYPE_UNKNOWN; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
641 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
642 do { |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
643 *fd_out = -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
644 next_url = NULL; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
645 extension = NULL; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
646 content_type = NULL; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
647 redirect = 0; |
903 | 648 |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
649 if( url==NULL ) { |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
650 return -1; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
651 } |
903 | 652 |
8570 | 653 // Checking for PNM:// |
654 if( !strcasecmp(url->protocol, "pnm") ) { | |
655 *file_format = DEMUXER_TYPE_REAL; | |
656 return 0; | |
657 } | |
8890
c9cbfb9d720c
Finally commented out the code for autodetection based on the extension.
bertrand
parents:
8824
diff
changeset
|
658 |
c9cbfb9d720c
Finally commented out the code for autodetection based on the extension.
bertrand
parents:
8824
diff
changeset
|
659 /* |
c9cbfb9d720c
Finally commented out the code for autodetection based on the extension.
bertrand
parents:
8824
diff
changeset
|
660 * An autodetection based on the extension is not a good idea. |
c9cbfb9d720c
Finally commented out the code for autodetection based on the extension.
bertrand
parents:
8824
diff
changeset
|
661 * |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
662 // Get the extension of the file if present |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
663 if( url->file!=NULL ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
664 for( i=strlen(url->file) ; i>0 ; i-- ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
665 if( url->file[i]=='.' ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
666 extension=(url->file)+i+1; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
667 break; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
668 } |
903 | 669 } |
670 } | |
3042 | 671 extension=NULL; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
672 if( extension!=NULL ) { |
5915 | 673 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Extension: %s\n", extension ); |
3042 | 674 // Look for the extension in the extensions table |
675 for( i=0 ; i<(sizeof(extensions_table)/sizeof(extensions_table[0])) ; i++ ) { | |
676 if( !strcasecmp(extension, extensions_table[i].extension) ) { | |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
677 *file_format = extensions_table[i].demuxer_type; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
678 return 0; |
3042 | 679 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
680 } |
903 | 681 } |
8890
c9cbfb9d720c
Finally commented out the code for autodetection based on the extension.
bertrand
parents:
8824
diff
changeset
|
682 */ |
c9cbfb9d720c
Finally commented out the code for autodetection based on the extension.
bertrand
parents:
8824
diff
changeset
|
683 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
684 // Checking for RTSP |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
685 if( !strcasecmp(url->protocol, "rtsp") ) { |
9922 | 686 // Checking for Real rtsp:// |
687 // Extension based detection, should be replaced with something based on server answer | |
11505
8de9dba0ffaa
Add detection of Real rtsp when there are queries in url.
rtognimp
parents:
11228
diff
changeset
|
688 if( url->file!= NULL ) { |
8de9dba0ffaa
Add detection of Real rtsp when there are queries in url.
rtognimp
parents:
11228
diff
changeset
|
689 char *p; |
8de9dba0ffaa
Add detection of Real rtsp when there are queries in url.
rtognimp
parents:
11228
diff
changeset
|
690 for( p = url->file; p[0]; p++ ) { |
8de9dba0ffaa
Add detection of Real rtsp when there are queries in url.
rtognimp
parents:
11228
diff
changeset
|
691 if( p[0] == '.' && tolower(p[1]) == 'r' && (tolower(p[2]) == 'm' || tolower(p[2]) == 'a') && (!p[3] || p[3] == '?' || p[3] == '&') ) { |
8de9dba0ffaa
Add detection of Real rtsp when there are queries in url.
rtognimp
parents:
11228
diff
changeset
|
692 *file_format = DEMUXER_TYPE_REAL; |
8de9dba0ffaa
Add detection of Real rtsp when there are queries in url.
rtognimp
parents:
11228
diff
changeset
|
693 return 0; |
10171
92adc6f5c00c
Recognize ra and rm extensions even with query strings,
rtognimp
parents:
10055
diff
changeset
|
694 } |
92adc6f5c00c
Recognize ra and rm extensions even with query strings,
rtognimp
parents:
10055
diff
changeset
|
695 } |
9922 | 696 } |
697 mp_msg(MSGT_NETWORK,MSGL_INFO,"Not a Realmedia rtsp url. Trying standard rtsp protocol.\n"); | |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
698 #ifdef STREAMING_LIVE_DOT_COM |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
699 *file_format = DEMUXER_TYPE_RTP; |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
700 return 0; |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
701 #else |
10055
2e6d63e564f2
We now check for "sip:" URLs - which are handled using the same LIVE.COM
rsf
parents:
9932
diff
changeset
|
702 mp_msg(MSGT_NETWORK,MSGL_ERR,"RTSP support requires the \"LIVE.COM Streaming Media\" libraries!\n"); |
2e6d63e564f2
We now check for "sip:" URLs - which are handled using the same LIVE.COM
rsf
parents:
9932
diff
changeset
|
703 return -1; |
2e6d63e564f2
We now check for "sip:" URLs - which are handled using the same LIVE.COM
rsf
parents:
9932
diff
changeset
|
704 #endif |
2e6d63e564f2
We now check for "sip:" URLs - which are handled using the same LIVE.COM
rsf
parents:
9932
diff
changeset
|
705 // Checking for SIP |
2e6d63e564f2
We now check for "sip:" URLs - which are handled using the same LIVE.COM
rsf
parents:
9932
diff
changeset
|
706 } else if( !strcasecmp(url->protocol, "sip") ) { |
2e6d63e564f2
We now check for "sip:" URLs - which are handled using the same LIVE.COM
rsf
parents:
9932
diff
changeset
|
707 #ifdef STREAMING_LIVE_DOT_COM |
2e6d63e564f2
We now check for "sip:" URLs - which are handled using the same LIVE.COM
rsf
parents:
9932
diff
changeset
|
708 *file_format = DEMUXER_TYPE_RTP; |
2e6d63e564f2
We now check for "sip:" URLs - which are handled using the same LIVE.COM
rsf
parents:
9932
diff
changeset
|
709 return 0; |
2e6d63e564f2
We now check for "sip:" URLs - which are handled using the same LIVE.COM
rsf
parents:
9932
diff
changeset
|
710 #else |
2e6d63e564f2
We now check for "sip:" URLs - which are handled using the same LIVE.COM
rsf
parents:
9932
diff
changeset
|
711 mp_msg(MSGT_NETWORK,MSGL_ERR,"SIP support requires the \"LIVE.COM Streaming Media\" libraries!\n"); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
712 return -1; |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
713 #endif |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
714 } |
903 | 715 |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
716 #ifndef STREAMING_LIVE_DOT_COM |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
717 // Old, hacked RTP support, which works for MPEG Program Streams |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
718 // RTP streams only: |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
719 // Checking for RTP |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
720 if( !strcasecmp(url->protocol, "rtp") ) { |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
721 if( url->port==0 ) { |
5915 | 722 mp_msg(MSGT_NETWORK,MSGL_ERR,"You must enter a port number for RTP streams!\n"); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
723 return -1; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
724 } |
4553
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
725 return 0; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
726 } |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
727 #endif |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
728 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
729 // Checking for ASF |
3453
10577da4a7b1
Added a data field in the streaming_ctrl_t struct, to store any
bertrand
parents:
3424
diff
changeset
|
730 if( !strncasecmp(url->protocol, "mms", 3) ) { |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
731 *file_format = DEMUXER_TYPE_ASF; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
732 return 0; |
903 | 733 } |
734 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
735 // HTTP based protocol |
4145 | 736 if( !strcasecmp(url->protocol, "http") || !strcasecmp(url->protocol, "http_proxy") ) { |
11965 | 737 fd = http_send_request( url, 0 ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
738 if( fd<0 ) { |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
739 return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
740 } |
903 | 741 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
742 http_hdr = http_read_response( fd ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
743 if( http_hdr==NULL ) { |
10281 | 744 closesocket( fd ); |
3042 | 745 http_free( http_hdr ); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
746 return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
747 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
748 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
749 *fd_out=fd; |
8027 | 750 if( verbose>0 ) { |
4121 | 751 http_debug_hdr( http_hdr ); |
752 } | |
753 | |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
754 streaming_ctrl->data = (void*)http_hdr; |
11965 | 755 |
756 // Check if we can make partial content requests and thus seek in http-streams | |
757 seekable=(http_hdr!=NULL && http_hdr->status_code==200 && strncmp(http_get_field(http_hdr,"Accept-Ranges"),"bytes",5)==0); | |
758 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
759 // Check if the response is an ICY status_code reason_phrase |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
760 if( !strcasecmp(http_hdr->protocol, "ICY") ) { |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
761 switch( http_hdr->status_code ) { |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
762 case 200: { // OK |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
763 char *field_data = NULL; |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
764 // note: I skip icy-notice1 and 2, as they contain html <BR> |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
765 // and are IMHO useless info ::atmos |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
766 if( (field_data = http_get_field(http_hdr, "icy-name")) != NULL ) |
5915 | 767 mp_msg(MSGT_NETWORK,MSGL_INFO,"Name : %s\n", field_data); field_data = NULL; |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
768 if( (field_data = http_get_field(http_hdr, "icy-genre")) != NULL ) |
5915 | 769 mp_msg(MSGT_NETWORK,MSGL_INFO,"Genre : %s\n", field_data); field_data = NULL; |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
770 if( (field_data = http_get_field(http_hdr, "icy-url")) != NULL ) |
5915 | 771 mp_msg(MSGT_NETWORK,MSGL_INFO,"Website: %s\n", field_data); field_data = NULL; |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
772 // XXX: does this really mean public server? ::atmos |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
773 if( (field_data = http_get_field(http_hdr, "icy-pub")) != NULL ) |
5915 | 774 mp_msg(MSGT_NETWORK,MSGL_INFO,"Public : %s\n", atoi(field_data)?"yes":"no"); field_data = NULL; |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
775 if( (field_data = http_get_field(http_hdr, "icy-br")) != NULL ) |
5915 | 776 mp_msg(MSGT_NETWORK,MSGL_INFO,"Bitrate: %skbit/s\n", field_data); field_data = NULL; |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
777 // Ok, we have detected an mp3 stream |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
778 *file_format = DEMUXER_TYPE_AUDIO; |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
779 return 0; |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
780 } |
5916 | 781 case 400: // Server Full |
782 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server is full, skipping!\n"); | |
783 return -1; | |
5892 | 784 case 401: // Service Unavailable |
5915 | 785 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server return service unavailable, skipping!\n"); |
5892 | 786 return -1; |
8766
50ffffd0bc18
Added the ICY 403 "Service Forbiden" error message.
bertrand
parents:
8570
diff
changeset
|
787 case 403: // Service Forbidden |
50ffffd0bc18
Added the ICY 403 "Service Forbiden" error message.
bertrand
parents:
8570
diff
changeset
|
788 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server return 'Service Forbidden'\n"); |
50ffffd0bc18
Added the ICY 403 "Service Forbiden" error message.
bertrand
parents:
8570
diff
changeset
|
789 return -1; |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
790 case 404: // Resource Not Found |
5915 | 791 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server couldn't find requested stream, skipping!\n"); |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
792 return -1; |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
793 default: |
5915 | 794 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: unhandled ICY-Errorcode, contact MPlayer developers!\n"); |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
795 return -1; |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
796 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
797 } |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
798 |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
799 // Assume standard http if not ICY |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
800 switch( http_hdr->status_code ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
801 case 200: // OK |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
802 // Look if we can use the Content-Type |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
803 content_type = http_get_field( http_hdr, "Content-Type" ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
804 if( content_type!=NULL ) { |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
805 char *content_length = NULL; |
5915 | 806 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", content_type ); |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
807 if( (content_length = http_get_field(http_hdr, "Content-Length")) != NULL) |
5915 | 808 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length")); |
3042 | 809 // Check in the mime type table for a demuxer type |
810 for( i=0 ; i<(sizeof(mime_type_table)/sizeof(mime_type_table[0])) ; i++ ) { | |
811 if( !strcasecmp( content_type, mime_type_table[i].mime_type ) ) { | |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
812 *file_format = mime_type_table[i].demuxer_type; |
11965 | 813 return seekable; // for streaming_start |
3042 | 814 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
815 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
816 } |
4817
1e46f40dcd0e
Handle HTTP OK response that doesn't contain a mime-type.
bertrand
parents:
4802
diff
changeset
|
817 // Not found in the mime type table, don't fail, |
1e46f40dcd0e
Handle HTTP OK response that doesn't contain a mime-type.
bertrand
parents:
4802
diff
changeset
|
818 // we should try raw HTTP |
11965 | 819 return seekable; // for streaming_start |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
820 // Redirect |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
821 case 301: // Permanently |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
822 case 302: // Temporarily |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
823 // TODO: RFC 2616, recommand to detect infinite redirection loops |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
824 next_url = http_get_field( http_hdr, "Location" ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
825 if( next_url!=NULL ) { |
10281 | 826 closesocket( fd ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
827 url_free( url ); |
4802 | 828 streaming_ctrl->url = url = url_new( next_url ); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
829 http_free( http_hdr ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
830 redirect = 1; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
831 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
832 break; |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
833 case 401: // Authentication required |
6555 | 834 if( http_authenticate(http_hdr, url, &auth_retry)<0 ) return -1; |
6515 | 835 redirect = 1; |
836 break; | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
837 default: |
5915 | 838 mp_msg(MSGT_NETWORK,MSGL_ERR,"Server returned %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
839 return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
840 } |
3453
10577da4a7b1
Added a data field in the streaming_ctrl_t struct, to store any
bertrand
parents:
3424
diff
changeset
|
841 } else { |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
842 mp_msg(MSGT_NETWORK,MSGL_V,"Unknown protocol '%s'\n", url->protocol ); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
843 return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
844 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
845 } while( redirect ); |
903 | 846 |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
847 return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
848 } |
903 | 849 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
850 int |
3042 | 851 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
|
852 //printf("streaming_bufferize\n"); |
3042 | 853 streaming_ctrl->buffer = (char*)malloc(size); |
854 if( streaming_ctrl->buffer==NULL ) { | |
5915 | 855 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n"); |
3042 | 856 return -1; |
857 } | |
858 memcpy( streaming_ctrl->buffer, buffer, size ); | |
859 streaming_ctrl->buffer_size = size; | |
3599 | 860 return size; |
3042 | 861 } |
862 | |
863 int | |
864 nop_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl ) { | |
865 int len=0; | |
866 //printf("nop_streaming_read\n"); | |
867 if( stream_ctrl->buffer_size!=0 ) { | |
868 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
|
869 //printf("%d bytes in buffer\n", stream_ctrl->buffer_size); |
3042 | 870 len = (size<buffer_len)?size:buffer_len; |
871 memcpy( buffer, (stream_ctrl->buffer)+(stream_ctrl->buffer_pos), len ); | |
872 stream_ctrl->buffer_pos += len; | |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
873 //printf("buffer_pos = %d\n", stream_ctrl->buffer_pos ); |
3042 | 874 if( stream_ctrl->buffer_pos>=stream_ctrl->buffer_size ) { |
875 free( stream_ctrl->buffer ); | |
876 stream_ctrl->buffer = NULL; | |
877 stream_ctrl->buffer_size = 0; | |
878 stream_ctrl->buffer_pos = 0; | |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
879 //printf("buffer cleaned\n"); |
3042 | 880 } |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
881 //printf("read %d bytes from buffer\n", len ); |
3042 | 882 } |
883 | |
884 if( len<size ) { | |
3365 | 885 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
|
886 ret = recv( fd, buffer+len, size-len, 0 ); |
3494
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
887 if( ret<0 ) { |
5915 | 888 mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_read error : %s\n",strerror(errno)); |
3365 | 889 } |
890 len += ret; | |
3042 | 891 //printf("read %d bytes from network\n", len ); |
892 } | |
893 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
894 return len; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
895 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
896 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
897 int |
3042 | 898 nop_streaming_seek( int fd, off_t pos, streaming_ctrl_t *stream_ctrl ) { |
899 return -1; | |
7953 | 900 // To shut up gcc warning |
901 fd++; | |
902 pos++; | |
903 stream_ctrl=NULL; | |
3042 | 904 } |
905 | |
906 int | |
907 nop_streaming_start( stream_t *stream ) { | |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
908 HTTP_header_t *http_hdr = NULL; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
909 int fd; |
3042 | 910 if( stream==NULL ) return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
911 |
3042 | 912 fd = stream->fd; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
913 if( fd<0 ) { |
11965 | 914 fd = http_send_request( stream->streaming_ctrl->url, 0 ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
915 if( fd<0 ) return -1; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
916 http_hdr = http_read_response( fd ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
917 if( http_hdr==NULL ) return -1; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
918 |
903 | 919 switch( http_hdr->status_code ) { |
920 case 200: // OK | |
5915 | 921 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") ); |
922 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") ); | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
923 if( http_hdr->body_size>0 ) { |
3042 | 924 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { |
925 http_free( http_hdr ); | |
926 return -1; | |
927 } | |
903 | 928 } |
929 break; | |
930 default: | |
5915 | 931 mp_msg(MSGT_NETWORK,MSGL_ERR,"Server return %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); |
10281 | 932 closesocket( fd ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
933 fd = -1; |
903 | 934 } |
3042 | 935 stream->fd = fd; |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
936 } else { |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
937 http_hdr = (HTTP_header_t*)stream->streaming_ctrl->data; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
938 if( http_hdr->body_size>0 ) { |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
939 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
940 http_free( http_hdr ); |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
941 stream->streaming_ctrl->data = NULL; |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
942 return -1; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
943 } |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
944 } |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
945 } |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
946 |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
947 if( http_hdr ) { |
3732 | 948 http_free( http_hdr ); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
949 stream->streaming_ctrl->data = NULL; |
903 | 950 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
951 |
3042 | 952 stream->streaming_ctrl->streaming_read = nop_streaming_read; |
953 stream->streaming_ctrl->streaming_seek = nop_streaming_seek; | |
8939 | 954 stream->streaming_ctrl->prebuffer_size = 64*1024; // 64 KBytes |
3042 | 955 stream->streaming_ctrl->buffering = 1; |
956 stream->streaming_ctrl->status = streaming_playing_e; | |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
957 return 0; |
903 | 958 } |
959 | |
8570 | 960 int |
961 pnm_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl ) { | |
962 return pnm_read(stream_ctrl->data, buffer, size); | |
963 } | |
964 | |
965 | |
966 int | |
967 pnm_streaming_start( stream_t *stream ) { | |
968 int fd; | |
969 pnm_t *pnm; | |
970 if( stream==NULL ) return -1; | |
971 | |
972 fd = connect2Server( stream->streaming_ctrl->url->hostname, | |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
973 stream->streaming_ctrl->url->port ? stream->streaming_ctrl->url->port : 7070,1 ); |
8570 | 974 printf("PNM:// fd=%d\n",fd); |
975 if(fd<0) return -1; | |
976 | |
977 pnm = pnm_connect(fd,stream->streaming_ctrl->url->file); | |
978 if(!pnm) return -1; | |
979 | |
980 stream->fd=fd; | |
981 stream->streaming_ctrl->data=pnm; | |
982 | |
983 stream->streaming_ctrl->streaming_read = pnm_streaming_read; | |
984 // stream->streaming_ctrl->streaming_seek = nop_streaming_seek; | |
8939 | 985 stream->streaming_ctrl->prebuffer_size = 8*1024; // 8 KBytes |
8570 | 986 stream->streaming_ctrl->buffering = 1; |
987 stream->streaming_ctrl->status = streaming_playing_e; | |
988 return 0; | |
989 } | |
990 | |
991 | |
9922 | 992 int |
993 realrtsp_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl ) { | |
994 return rtsp_session_read(stream_ctrl->data, buffer, size); | |
995 } | |
996 | |
997 | |
998 int | |
999 realrtsp_streaming_start( stream_t *stream ) { | |
1000 int fd; | |
1001 rtsp_session_t *rtsp; | |
1002 char *mrl; | |
1003 int port; | |
10199 | 1004 int redirected, temp; |
9922 | 1005 if( stream==NULL ) return -1; |
10199 | 1006 |
1007 temp = 5; // counter so we don't get caught in infinite redirections (you never know) | |
1008 | |
1009 do { | |
1010 | |
10317 | 1011 redirected = 0; |
9922 | 1012 |
10317 | 1013 fd = connect2Server( stream->streaming_ctrl->url->hostname, |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10317
diff
changeset
|
1014 port = (stream->streaming_ctrl->url->port ? stream->streaming_ctrl->url->port : 554),1 ); |
10317 | 1015 if(fd<0) return -1; |
1016 | |
1017 mrl = malloc(sizeof(char)*(strlen(stream->streaming_ctrl->url->hostname)+strlen(stream->streaming_ctrl->url->file)+16)); | |
1018 sprintf(mrl,"rtsp://%s:%i/%s",stream->streaming_ctrl->url->hostname,port,stream->streaming_ctrl->url->file); | |
1019 rtsp = rtsp_session_start(fd,&mrl, stream->streaming_ctrl->url->file, | |
1020 stream->streaming_ctrl->url->hostname, port, &redirected); | |
10199 | 1021 |
10317 | 1022 if ( redirected == 1 ) { |
1023 url_free(stream->streaming_ctrl->url); | |
1024 stream->streaming_ctrl->url = url_new(mrl); | |
1025 closesocket(fd); | |
1026 } | |
10199 | 1027 |
10317 | 1028 free(mrl); |
1029 temp--; | |
10199 | 1030 |
1031 } while( (redirected != 0) && (temp > 0) ); | |
1032 | |
9922 | 1033 if(!rtsp) return -1; |
1034 | |
1035 stream->fd=fd; | |
1036 stream->streaming_ctrl->data=rtsp; | |
1037 | |
1038 stream->streaming_ctrl->streaming_read = realrtsp_streaming_read; | |
1039 // stream->streaming_ctrl->streaming_seek = nop_streaming_seek; | |
1040 stream->streaming_ctrl->prebuffer_size = 128*1024; // 8 KBytes | |
1041 stream->streaming_ctrl->buffering = 1; | |
1042 stream->streaming_ctrl->status = streaming_playing_e; | |
1043 return 0; | |
1044 } | |
1045 | |
1046 | |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
1047 #ifndef STREAMING_LIVE_DOT_COM |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1048 // Start listening on a UDP port. If multicast, join the group. |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1049 int |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1050 rtp_open_socket( URL_t *url ) { |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
1051 int socket_server_fd, rxsockbufsz; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1052 int err, err_len; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1053 fd_set set; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1054 struct sockaddr_in server_address; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1055 struct ip_mreq mcast; |
4553
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
1056 struct timeval tv; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1057 |
5915 | 1058 mp_msg(MSGT_NETWORK,MSGL_V,"Listening for traffic on %s:%d ...\n", url->hostname, url->port ); |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1059 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1060 socket_server_fd = socket(AF_INET, SOCK_DGRAM, 0); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1061 // fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) | O_NONBLOCK ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1062 if( socket_server_fd==-1 ) { |
6454 | 1063 mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to create socket\n"); |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1064 return -1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1065 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1066 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1067 if( isalpha(url->hostname[0]) ) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1068 struct hostent *hp =(struct hostent*)gethostbyname( url->hostname ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1069 if( hp==NULL ) { |
5915 | 1070 mp_msg(MSGT_NETWORK,MSGL_ERR,"Counldn't resolve name: %s\n", url->hostname); |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1071 return -1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1072 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1073 memcpy( (void*)&server_address.sin_addr.s_addr, (void*)hp->h_addr, hp->h_length ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1074 } else { |
10281 | 1075 #ifndef HAVE_WINSOCK2 |
9890
237fcb766110
removed some wrappers, now the configure checks for inet_pton. patch by Joey Parrish <joey@nicewarrior.org>
alex
parents:
9749
diff
changeset
|
1076 #ifdef USE_ATON |
237fcb766110
removed some wrappers, now the configure checks for inet_pton. patch by Joey Parrish <joey@nicewarrior.org>
alex
parents:
9749
diff
changeset
|
1077 inet_aton(url->hostname, &server_address.sin_addr); |
237fcb766110
removed some wrappers, now the configure checks for inet_pton. patch by Joey Parrish <joey@nicewarrior.org>
alex
parents:
9749
diff
changeset
|
1078 #else |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1079 inet_pton(AF_INET, url->hostname, &server_address.sin_addr); |
9890
237fcb766110
removed some wrappers, now the configure checks for inet_pton. patch by Joey Parrish <joey@nicewarrior.org>
alex
parents:
9749
diff
changeset
|
1080 #endif |
10281 | 1081 #else |
1082 unsigned int addr = inet_addr(url->hostname); | |
1083 memcpy( (void*)&server_address.sin_addr, (void*)&addr, sizeof(addr) ); | |
1084 #endif | |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1085 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1086 server_address.sin_family=AF_INET; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1087 server_address.sin_port=htons(url->port); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1088 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1089 if( bind( socket_server_fd, (struct sockaddr*)&server_address, sizeof(server_address) )==-1 ) { |
10281 | 1090 #ifndef HAVE_WINSOCK2 |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1091 if( errno!=EINPROGRESS ) { |
10281 | 1092 #else |
1093 if( WSAGetLastError() != WSAEINPROGRESS ) { | |
1094 #endif | |
6454 | 1095 mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to connect to server\n"); |
10281 | 1096 closesocket(socket_server_fd); |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1097 return -1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1098 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1099 } |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
1100 |
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
1101 // Increase the socket rx buffer size to maximum -- this is UDP |
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
1102 rxsockbufsz = 240 * 1024; |
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
1103 if( setsockopt( socket_server_fd, SOL_SOCKET, SO_RCVBUF, &rxsockbufsz, sizeof(rxsockbufsz))) { |
6454 | 1104 mp_msg(MSGT_NETWORK,MSGL_ERR,"Couldn't set receive socket buffer size\n"); |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
1105 } |
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
1106 |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1107 if((ntohl(server_address.sin_addr.s_addr) >> 28) == 0xe) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1108 mcast.imr_multiaddr.s_addr = server_address.sin_addr.s_addr; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1109 //mcast.imr_interface.s_addr = inet_addr("10.1.1.2"); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1110 mcast.imr_interface.s_addr = 0; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1111 if( setsockopt( socket_server_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mcast, sizeof(mcast))) { |
6454 | 1112 mp_msg(MSGT_NETWORK,MSGL_ERR,"IP_ADD_MEMBERSHIP failed (do you have multicasting enabled in your kernel?)\n"); |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1113 return -1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1114 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1115 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1116 |
4553
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
1117 tv.tv_sec = 0; |
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
1118 tv.tv_usec = (1 * 1000000); // 1 second timeout |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1119 FD_ZERO( &set ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1120 FD_SET( socket_server_fd, &set ); |
4553
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
1121 if( select(socket_server_fd+1, &set, NULL, NULL, &tv)>0 ) { |
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
1122 //if( select(socket_server_fd+1, &set, NULL, NULL, NULL)>0 ) { |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1123 err_len = sizeof( err ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1124 getsockopt( socket_server_fd, SOL_SOCKET, SO_ERROR, &err, &err_len ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1125 if( err ) { |
5915 | 1126 mp_msg(MSGT_NETWORK,MSGL_ERR,"Timeout! No data from host %s\n", url->hostname ); |
1127 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Socket error: %d\n", err ); | |
10281 | 1128 closesocket(socket_server_fd); |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1129 return -1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1130 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1131 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1132 return socket_server_fd; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1133 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1134 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1135 int |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1136 rtp_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *streaming_ctrl ) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1137 return read_rtp_from_server( fd, buffer, size ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1138 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1139 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1140 int |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1141 rtp_streaming_start( stream_t *stream ) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1142 streaming_ctrl_t *streaming_ctrl; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1143 int fd; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1144 |
3732 | 1145 if( stream==NULL ) return -1; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1146 streaming_ctrl = stream->streaming_ctrl; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1147 fd = stream->fd; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1148 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1149 if( fd<0 ) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1150 fd = rtp_open_socket( (streaming_ctrl->url) ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1151 if( fd<0 ) return -1; |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
1152 stream->fd = fd; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1153 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1154 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1155 streaming_ctrl->streaming_read = rtp_streaming_read; |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
1156 streaming_ctrl->streaming_seek = nop_streaming_seek; |
8939 | 1157 streaming_ctrl->prebuffer_size = 64*1024; // 64 KBytes |
4289
973c6912c586
Set the cache value if the network layer was able to compute it.
bertrand
parents:
4251
diff
changeset
|
1158 streaming_ctrl->buffering = 0; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1159 streaming_ctrl->status = streaming_playing_e; |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
1160 return 0; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1161 } |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
1162 #endif |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1163 |
903 | 1164 int |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
1165 streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) { |
7953 | 1166 int ret; |
3042 | 1167 if( stream==NULL ) return -1; |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
1168 |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
1169 stream->streaming_ctrl = streaming_ctrl_new(); |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
1170 if( stream->streaming_ctrl==NULL ) { |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
1171 return -1; |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
1172 } |
4652 | 1173 stream->streaming_ctrl->url = check4proxies( url ); |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
1174 ret = autodetectProtocol( stream->streaming_ctrl, &stream->fd, demuxer_type ); |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
1175 if( ret<0 ) { |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
1176 return -1; |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
1177 } |
11965 | 1178 if( ret==1 ) { |
1179 stream->flags |= STREAM_SEEK; | |
1180 stream->seek = http_seek; | |
1181 } | |
1182 | |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
1183 ret = -1; |
3042 | 1184 |
6642
e47d54a2cfff
Retreive the bandwidth option from the command line.
bertrand
parents:
6570
diff
changeset
|
1185 // Get the bandwidth available |
7867 | 1186 stream->streaming_ctrl->bandwidth = network_bandwidth; |
6642
e47d54a2cfff
Retreive the bandwidth option from the command line.
bertrand
parents:
6570
diff
changeset
|
1187 |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
1188 #ifndef STREAMING_LIVE_DOT_COM |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1189 // For RTP streams, we usually don't know the stream type until we open it. |
4121 | 1190 if( !strcasecmp( stream->streaming_ctrl->url->protocol, "rtp")) { |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
1191 if(stream->fd >= 0) { |
10281 | 1192 if(closesocket(stream->fd) < 0) |
5915 | 1193 mp_msg(MSGT_NETWORK,MSGL_ERR,"streaming_start : Closing socket %d failed %s\n",stream->fd,strerror(errno)); |
4041
879a668ee540
various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents:
3732
diff
changeset
|
1194 } |
879a668ee540
various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents:
3732
diff
changeset
|
1195 stream->fd = -1; |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
1196 ret = rtp_streaming_start( stream ); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
1197 } else |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
1198 #endif |
8570 | 1199 |
1200 if( !strcasecmp( stream->streaming_ctrl->url->protocol, "pnm")) { | |
1201 stream->fd = -1; | |
1202 ret = pnm_streaming_start( stream ); | |
1203 } else | |
1204 | |
9922 | 1205 if( (!strcasecmp( stream->streaming_ctrl->url->protocol, "rtsp")) && |
1206 (*demuxer_type == DEMUXER_TYPE_REAL)) { | |
1207 stream->fd = -1; | |
1208 ret = realrtsp_streaming_start( stream ); | |
1209 } else | |
1210 | |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
1211 // For connection-oriented streams, we can usually determine the streaming type. |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
1212 switch( *demuxer_type ) { |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
1213 case DEMUXER_TYPE_ASF: |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
1214 // Send the appropriate HTTP request |
3042 | 1215 // Need to filter the network stream. |
1216 // ASF raw stream is encapsulated. | |
9749 | 1217 // It can also be a playlist (redirector) |
1218 // so we need to pass demuxer_type too | |
1219 ret = asf_streaming_start( stream, demuxer_type ); | |
3604
6bd312199a75
If the demuxer type is unknown it will start an http streaming.
bertrand
parents:
3599
diff
changeset
|
1220 if( ret<0 ) { |
5915 | 1221 mp_msg(MSGT_NETWORK,MSGL_ERR,"asf_streaming_start failed\n"); |
3604
6bd312199a75
If the demuxer type is unknown it will start an http streaming.
bertrand
parents:
3599
diff
changeset
|
1222 } |
903 | 1223 break; |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
1224 #ifdef STREAMING_LIVE_DOT_COM |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
1225 case DEMUXER_TYPE_RTP: |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
1226 // RTSP/RTP streaming is handled separately: |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
1227 ret = rtsp_streaming_start( stream ); |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
1228 if( ret<0 ) { |
7007 | 1229 mp_msg(MSGT_NETWORK,MSGL_ERR,"rtsp_streaming_start failed\n"); |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
1230 } |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
1231 break; |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
1232 #endif |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
1233 case DEMUXER_TYPE_MPEG_ES: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
1234 case DEMUXER_TYPE_MPEG_PS: |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
1235 case DEMUXER_TYPE_AVI: |
3042 | 1236 case DEMUXER_TYPE_MOV: |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
1237 case DEMUXER_TYPE_VIVO: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
1238 case DEMUXER_TYPE_FLI: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
1239 case DEMUXER_TYPE_REAL: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
1240 case DEMUXER_TYPE_Y4M: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
1241 case DEMUXER_TYPE_FILM: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
1242 case DEMUXER_TYPE_ROQ: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
1243 case DEMUXER_TYPE_AUDIO: |
8114
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
1244 case DEMUXER_TYPE_OGG: |
4783 | 1245 case DEMUXER_TYPE_PLAYLIST: |
3604
6bd312199a75
If the demuxer type is unknown it will start an http streaming.
bertrand
parents:
3599
diff
changeset
|
1246 case DEMUXER_TYPE_UNKNOWN: |
3042 | 1247 // Generic start, doesn't need to filter |
1248 // the network stream, it's a raw stream | |
1249 ret = nop_streaming_start( stream ); | |
3604
6bd312199a75
If the demuxer type is unknown it will start an http streaming.
bertrand
parents:
3599
diff
changeset
|
1250 if( ret<0 ) { |
5915 | 1251 mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_start failed\n"); |
3604
6bd312199a75
If the demuxer type is unknown it will start an http streaming.
bertrand
parents:
3599
diff
changeset
|
1252 } |
903 | 1253 break; |
1254 default: | |
5915 | 1255 mp_msg(MSGT_NETWORK,MSGL_ERR,"Unable to detect the streaming type\n"); |
3042 | 1256 ret = -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
1257 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
1258 |
3042 | 1259 if( ret<0 ) { |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
1260 streaming_ctrl_free( stream->streaming_ctrl ); |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
1261 stream->streaming_ctrl = NULL; |
4652 | 1262 } else if( stream->streaming_ctrl->buffering ) { |
7881
aba9301ed3c4
allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents:
7867
diff
changeset
|
1263 if(stream_cache_size<0) { |
6555 | 1264 // cache option not set, will use our computed value. |
4302
9f12fd5f47d0
Modified the cache option value setting/reading, so we can report
bertrand
parents:
4293
diff
changeset
|
1265 // buffer in KBytes, *5 because the prefill is 20% of the buffer. |
7867 | 1266 stream_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5; |
8939 | 1267 if( stream_cache_size<64 ) stream_cache_size = 64; // 16KBytes min buffer |
4302
9f12fd5f47d0
Modified the cache option value setting/reading, so we can report
bertrand
parents:
4293
diff
changeset
|
1268 } |
7867 | 1269 mp_msg(MSGT_NETWORK,MSGL_INFO,"Cache size set to %d KBytes\n", stream_cache_size); |
4289
973c6912c586
Set the cache value if the network layer was able to compute it.
bertrand
parents:
4251
diff
changeset
|
1270 } |
6032 | 1271 |
3042 | 1272 return ret; |
903 | 1273 } |
1274 | |
1275 int | |
3042 | 1276 streaming_stop( stream_t *stream ) { |
1277 stream->streaming_ctrl->status = streaming_stopped_e; | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
1278 return 0; |
903 | 1279 } |