X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fhttp.c;h=9952fcfabd3484547e4afe77c3aa260f500d1ed5;hb=ad9b410d67c47b4a52bd393e67925b6b14d3f7c2;hp=a4bc00e323de33253eee66a4dca3e3862730c681;hpb=4e497a21adba27e618095b7b3f2538e3adadd6fe;p=vlc diff --git a/modules/access/http.c b/modules/access/http.c index a4bc00e323..9952fcfabd 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -37,12 +37,13 @@ #include -#include +#include #include #include #include #include #include +#include #include #include @@ -52,8 +53,8 @@ #include -#ifdef HAVE_PROXY_H -# include "proxy.h" +#ifdef HAVE_LIBPROXY +# include #endif /***************************************************************************** * Module descriptor @@ -92,37 +93,40 @@ static void Close( vlc_object_t * ); "types of HTTP streams." ) #define FORWARD_COOKIES_TEXT N_("Forward Cookies") -#define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies Across http redirections ") +#define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies across http redirections ") -vlc_module_begin(); - set_description( N_("HTTP input") ); - set_capability( "access", 0 ); - set_shortname( N_( "HTTP(S)" ) ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_description( N_("HTTP input") ) + set_capability( "access", 0 ) + set_shortname( N_( "HTTP(S)" ) ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT, - false ); + false ) add_password( "http-proxy-pwd", NULL, NULL, - PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false ); + PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false ) add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) + change_safe() add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT, - AGENT_LONGTEXT, true ); + AGENT_LONGTEXT, true ) add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT, - RECONNECT_LONGTEXT, true ); + RECONNECT_LONGTEXT, true ) add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT, - CONTINUOUS_LONGTEXT, true ); - add_bool( "http-forward-cookies", 0, NULL, FORWARD_COOKIES_TEXT, - FORWARD_COOKIES_LONGTEXT, true ); - add_obsolete_string("http-user"); - add_obsolete_string("http-pwd"); - add_shortcut( "http" ); - add_shortcut( "https" ); - add_shortcut( "unsv" ); - add_shortcut( "itpc" ); /* iTunes Podcast */ - set_callbacks( Open, Close ); -vlc_module_end(); + CONTINUOUS_LONGTEXT, true ) + change_safe() + add_bool( "http-forward-cookies", true, NULL, FORWARD_COOKIES_TEXT, + FORWARD_COOKIES_LONGTEXT, true ) + add_obsolete_string("http-user") + add_obsolete_string("http-pwd") + add_shortcut( "http" ) + add_shortcut( "https" ) + add_shortcut( "unsv" ) + add_shortcut( "itpc" ) /* iTunes Podcast */ + add_shortcut( "icyx" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes @@ -184,16 +188,18 @@ struct access_sys_t int64_t i_chunk; int i_icy_meta; + int64_t i_icy_offset; char *psz_icy_name; char *psz_icy_genre; char *psz_icy_title; - int i_remaining; + int64_t i_remaining; bool b_seekable; bool b_reconnect; bool b_continuous; bool b_pace_control; + bool b_persist; vlc_array_t * cookies; }; @@ -242,7 +248,7 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) char *psz, *p; /* Only forward an store cookies if the corresponding option is activated */ bool b_forward_cookies = var_CreateGetBool( p_access, "http-forward-cookies" ); - vlc_array_t * saved_cookies = b_forward_cookies ? (cookies ?: vlc_array_new()) : NULL; + vlc_array_t * saved_cookies = b_forward_cookies ? (cookies ? cookies : vlc_array_new()) : NULL; /* Set up p_access */ STANDARD_READ_ACCESS_INIT; @@ -275,10 +281,15 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) p_sys->p_tls = NULL; p_sys->p_vs = NULL; p_sys->i_icy_meta = 0; + p_sys->i_icy_offset = 0; p_sys->psz_icy_name = NULL; p_sys->psz_icy_genre = NULL; p_sys->psz_icy_title = NULL; p_sys->i_remaining = 0; + p_sys->b_persist = false; + p_access->info.i_size = -1; + p_access->info.i_pos = 0; + p_access->info.b_eof = false; p_sys->cookies = saved_cookies; @@ -318,7 +329,7 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) vlc_UrlParse( &p_sys->proxy, psz, 0 ); free( psz ); } -#ifdef HAVE_PROXY_H +#ifdef HAVE_LIBPROXY else { pxProxyFactory *pf = px_proxy_factory_new(); @@ -334,7 +345,7 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) if (proxies[0]) { msg_Dbg(p_access, "libproxy suggest to use '%s'", proxies[0]); - if(strcmp(proxies[0],"direct://") != 0) + if(strcmp(proxies[0],"direct://") != 0) { p_sys->b_proxy = true; vlc_UrlParse( &p_sys->proxy, proxies[0], 0); @@ -410,7 +421,7 @@ connect: p_sys->i_version = 0; p_sys->b_seekable = false; - if( p_access->b_die || Connect( p_access, 0 ) ) + if( !vlc_object_alive (p_access) || Connect( p_access, 0 ) ) goto error; #ifndef NDEBUG @@ -425,30 +436,26 @@ connect: if( p_sys->i_code == 401 ) { - char *psz_login = NULL, *psz_password = NULL; - char psz_msg[250]; - int i_ret; + char *psz_login, *psz_password; /* FIXME ? */ if( p_sys->url.psz_username && p_sys->url.psz_password && p_sys->auth.psz_nonce && p_sys->auth.i_nonce == 0 ) { + Disconnect( p_access ); goto connect; } - snprintf( psz_msg, 250, - _("Please enter a valid login name and a password for realm %s."), - p_sys->auth.psz_realm ); msg_Dbg( p_access, "authentication failed for realm %s", - p_sys->auth.psz_realm ); - i_ret = intf_UserLoginPassword( p_access, _("HTTP authentication"), - psz_msg, &psz_login, &psz_password ); - if( i_ret == DIALOG_OK_YES ) + p_sys->auth.psz_realm ); + dialog_Login( p_access, &psz_login, &psz_password, + _("HTTP authentication"), + _("Please enter a valid login name and a password for realm %s."), + p_sys->auth.psz_realm ); + if( psz_login != NULL && psz_password != NULL ) { - msg_Dbg( p_access, "retrying with user=%s, pwd=%s", - psz_login, psz_password ); - if( psz_login ) p_sys->url.psz_username = strdup( psz_login ); - if( psz_password ) p_sys->url.psz_password = strdup( psz_password ); - free( psz_login ); - free( psz_password ); + msg_Dbg( p_access, "retrying with user=%s", psz_login ); + p_sys->url.psz_username = psz_login; + p_sys->url.psz_password = psz_password; + Disconnect( p_access ); goto connect; } else @@ -577,6 +584,18 @@ error: free( p_sys->psz_user_agent ); Disconnect( p_access ); + + if( p_sys->cookies ) + { + int i; + for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ ) + free(vlc_array_item_at_index( p_sys->cookies, i )); + vlc_array_destroy( p_sys->cookies ); + } + +#ifdef HAVE_ZLIB_H + inflateEnd( &p_sys->inflate.stream ); +#endif free( p_sys ); return VLC_EGENERIC; } @@ -632,13 +651,13 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) access_sys_t *p_sys = p_access->p_sys; int i_read; - if( p_sys->fd < 0 ) + if( p_sys->fd == -1 ) { p_access->info.b_eof = true; return 0; } - if( p_access->info.i_size > 0 && + if( p_access->info.i_size >= 0 && i_len + p_access->info.i_pos > p_access->info.i_size ) { if( ( i_len = p_access->info.i_size - p_access->info.i_pos ) == 0 ) @@ -682,24 +701,20 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) i_len = p_sys->i_chunk; } } - - if( p_sys->b_continuous && (ssize_t)i_len > p_sys->i_remaining ) - { + else if( p_access->info.i_size != -1 && (int64_t)i_len > p_sys->i_remaining) { /* Only ask for the remaining length */ - int i_new_len = p_sys->i_remaining; - if( i_new_len == 0 ) - { - Request( p_access, 0 ); - i_read = Read( p_access, p_buffer, i_len ); - return i_read; + i_len = (size_t)p_sys->i_remaining; + if(i_len == 0) { + p_access->info.b_eof = true; + return 0; } - i_len = i_new_len; } - if( p_sys->i_icy_meta > 0 && p_access->info.i_pos > 0 ) + + if( p_sys->i_icy_meta > 0 && p_access->info.i_pos-p_sys->i_icy_offset > 0 ) { int64_t i_next = p_sys->i_icy_meta - - p_access->info.i_pos % p_sys->i_icy_meta; + (p_access->info.i_pos - p_sys->i_icy_offset ) % p_sys->i_icy_meta; if( i_next == p_sys->i_icy_meta ) { @@ -730,7 +745,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) } } } - else if( i_read == 0 ) + else if( i_read <= 0 ) { /* * I very much doubt that this will work. @@ -761,10 +776,13 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) } } - if( i_read == 0 ) p_access->info.b_eof = true; + if( i_read == 0 ) + p_access->info.b_eof = true; + else if( i_read < 0 ) + p_access->b_error = true; } - if( p_sys->b_continuous ) + if( p_access->info.i_size != -1 ) { p_sys->i_remaining -= i_read; } @@ -825,7 +843,10 @@ static int ReadICYMeta( access_t *p_access ) strcmp( p_sys->psz_icy_title, &p[1] ) ) { free( p_sys->psz_icy_title ); - p_sys->psz_icy_title = strdup( &p[1] ); + char *psz_tmp = strdup( &p[1] ); + p_sys->psz_icy_title = EnsureUTF8( psz_tmp ); + if( !p_sys->psz_icy_title ) + free( psz_tmp ); p_access->info.i_update |= INPUT_UPDATE_META; msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title ); @@ -907,10 +928,9 @@ static int Seek( access_t *p_access, int64_t i_pos ) static int Control( access_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; - bool *pb_bool; - int *pi_int; - int64_t *pi_64; - vlc_meta_t *p_meta; + bool *pb_bool; + int64_t *pi_64; + vlc_meta_t *p_meta; switch( i_query ) { @@ -935,11 +955,6 @@ static int Control( access_t *p_access, int i_query, va_list args ) break; /* */ - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = 0; - break; - case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); *pi_64 = (int64_t)var_GetInteger( p_access, "http-caching" ) * 1000; @@ -1004,22 +1019,26 @@ static int Connect( access_t *p_access, int64_t i_tell ) p_sys->b_chunked = false; p_sys->i_chunk = 0; p_sys->i_icy_meta = 0; + p_sys->i_icy_offset = i_tell; p_sys->psz_icy_name = NULL; p_sys->psz_icy_genre = NULL; p_sys->psz_icy_title = NULL; + p_sys->i_remaining = 0; + p_sys->b_persist = false; - p_access->info.i_size = 0; + p_access->info.i_size = -1; p_access->info.i_pos = i_tell; p_access->info.b_eof = false; - /* Open connection */ + assert( p_sys->fd == -1 ); /* No open sockets (leaking fds is BAD) */ p_sys->fd = net_ConnectTCP( p_access, srv.psz_host, srv.i_port ); if( p_sys->fd == -1 ) { msg_Err( p_access, "cannot connect to %s:%d", srv.psz_host, srv.i_port ); return -1; } + setsockopt (p_sys->fd, SOL_SOCKET, SO_KEEPALIVE, &(int){ 1 }, sizeof (int)); /* Initialize TLS/SSL session */ if( p_sys->b_ssl == true ) @@ -1076,7 +1095,7 @@ static int Connect( access_t *p_access, int64_t i_tell ) free( psz ); - if( p_access->b_die || p_access->b_error ) + if( !vlc_object_alive (p_access) || p_access->b_error ) { Disconnect( p_access ); return -1; @@ -1087,7 +1106,7 @@ static int Connect( access_t *p_access, int64_t i_tell ) /* TLS/SSL handshake */ p_sys->p_tls = tls_ClientCreate( VLC_OBJECT(p_access), p_sys->fd, - srv.psz_host ); + p_sys->url.psz_host ); if( p_sys->p_tls == NULL ) { msg_Err( p_access, "cannot establish HTTP/TLS session" ); @@ -1106,7 +1125,9 @@ static int Request( access_t *p_access, int64_t i_tell ) access_sys_t *p_sys = p_access->p_sys; char *psz ; v_socket_t *pvs = p_sys->p_vs; + p_sys->b_persist = false; + p_sys->i_remaining = 0; if( p_sys->b_proxy ) { if( p_sys->url.psz_path ) @@ -1149,8 +1170,9 @@ static int Request( access_t *p_access, int64_t i_tell ) net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "User-Agent: %s\r\n", p_sys->psz_user_agent ); /* Offset */ - if( p_sys->i_version == 1 ) + if( p_sys->i_version == 1 && ! p_sys->b_continuous ) { + p_sys->b_persist = true; net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Range: bytes=%"PRIu64"-\r\n", i_tell ); } @@ -1258,7 +1280,7 @@ static int Request( access_t *p_access, int64_t i_tell ) goto error; } - if( p_access->b_die || p_access->b_error ) + if( !vlc_object_alive (p_access) || p_access->b_error ) { free( psz ); goto error; @@ -1282,16 +1304,33 @@ static int Request( access_t *p_access, int64_t i_tell ) if( !strcasecmp( psz, "Content-Length" ) ) { - if( p_sys->b_continuous ) - { - p_access->info.i_size = -1; - msg_Dbg( p_access, "this frame size=%lld", atoll(p ) ); - p_sys->i_remaining = atoll( p ); + int64_t i_size = i_tell + (p_sys->i_remaining = atoll( p )); + if(i_size > p_access->info.i_size) { + p_access->info.i_size = i_size; } - else - { - p_access->info.i_size = i_tell + atoll( p ); - msg_Dbg( p_access, "stream size=%"PRId64, p_access->info.i_size ); + msg_Dbg( p_access, "this frame size=%"PRId64, p_sys->i_remaining ); + } + else if( !strcasecmp( psz, "Content-Range" ) ) { + int64_t i_ntell = i_tell; + int64_t i_nend = (p_access->info.i_size > 0)?(p_access->info.i_size - 1):i_tell; + int64_t i_nsize = p_access->info.i_size; + sscanf(p,"bytes %"PRId64"-%"PRId64"/%"PRId64,&i_ntell,&i_nend,&i_nsize); + if(i_nend > i_ntell ) { + p_access->info.i_pos = i_ntell; + p_sys->i_remaining = i_nend+1-i_ntell; + int64_t i_size = (i_nsize > i_nend) ? i_nsize : (i_nend + 1); + if(i_size > p_access->info.i_size) { + p_access->info.i_size = i_size; + } + msg_Dbg( p_access, "stream size=%"PRId64",pos=%"PRId64",remaining=%"PRId64,i_nsize,i_ntell,p_sys->i_remaining); + } + } + else if( !strcasecmp( psz, "Connection" ) ) { + msg_Dbg( p_access, "Connection: %s",p ); + int i = -1; + sscanf(p, "close%n",&i); + if( i >= 0 ) { + p_sys->b_persist = false; } } else if( !strcasecmp( psz, "Location" ) ) @@ -1381,13 +1420,18 @@ static int Request( access_t *p_access, int64_t i_tell ) p_sys->i_icy_meta = atoi( p ); if( p_sys->i_icy_meta < 0 ) p_sys->i_icy_meta = 0; + if( p_sys->i_icy_meta > 0 ) + p_sys->b_icecast = true; msg_Warn( p_access, "ICY metaint=%d", p_sys->i_icy_meta ); } else if( !strcasecmp( psz, "Icy-Name" ) ) { free( p_sys->psz_icy_name ); - p_sys->psz_icy_name = strdup( p ); + char *psz_tmp = strdup( p ); + p_sys->psz_icy_name = EnsureUTF8( psz_tmp ); + if( !p_sys->psz_icy_name ) + free( psz_tmp ); msg_Dbg( p_access, "Icy-Name: %s", p_sys->psz_icy_name ); p_sys->b_icecast = true; /* be on the safeside. set it here as well. */ @@ -1397,7 +1441,10 @@ static int Request( access_t *p_access, int64_t i_tell ) else if( !strcasecmp( psz, "Icy-Genre" ) ) { free( p_sys->psz_icy_genre ); - p_sys->psz_icy_genre = strdup( p ); + char *psz_tmp = strdup( p ); + p_sys->psz_icy_genre = EnsureUTF8( psz_tmp ); + if( !p_sys->psz_icy_genre ) + free( psz_tmp ); msg_Dbg( p_access, "Icy-Genre: %s", p_sys->psz_icy_genre ); } else if( !strncasecmp( psz, "Icy-Notice", 10 ) ) @@ -1445,7 +1492,10 @@ static int Request( access_t *p_access, int64_t i_tell ) free( psz ); } - if(p_sys->i_remaining == 0 && (p_access->info.i_size == -1 || p_access->info.i_size == i_tell)) { + /* We close the stream for zero length data, unless of course the + * server has already promised to do this for us. + */ + if( p_access->info.i_size != -1 && p_sys->i_remaining == 0 && p_sys->b_persist ) { Disconnect( p_access ); } return VLC_SUCCESS; @@ -1676,7 +1726,7 @@ static void AuthParseHeader( access_t *p_access, const char *psz_header, const char *psz_end = strchr( psz_header, ' ' ); if( psz_end ) msg_Warn( p_access, "Unknown authentication scheme: '%*s'", - psz_end - psz_header, psz_header ); + (int)(psz_end - psz_header), psz_header ); else msg_Warn( p_access, "Unknown authentication scheme: '%s'", psz_header ); @@ -1687,8 +1737,8 @@ static char *AuthDigest( access_t *p_access, vlc_url_t *p_url, http_auth_t *p_auth, const char *psz_method ) { (void)p_access; - const char *psz_username = p_url->psz_username ?: ""; - const char *psz_password = p_url->psz_password ?: ""; + const char *psz_username = p_url->psz_username ? p_url->psz_username : ""; + const char *psz_password = p_url->psz_password ? p_url->psz_password : ""; char *psz_HA1 = NULL; char *psz_HA2 = NULL; @@ -1795,8 +1845,8 @@ static void AuthReply( access_t *p_access, const char *psz_prefix, access_sys_t *p_sys = p_access->p_sys; v_socket_t *pvs = p_sys->p_vs; - const char *psz_username = p_url->psz_username ?: ""; - const char *psz_password = p_url->psz_password ?: ""; + const char *psz_username = p_url->psz_username ? p_url->psz_username : ""; + const char *psz_password = p_url->psz_password ? p_url->psz_password : ""; if( p_auth->psz_nonce ) { @@ -1844,20 +1894,20 @@ static void AuthReply( access_t *p_access, const char *psz_prefix, psz_username, p_auth->psz_realm, p_auth->psz_nonce, - p_url->psz_path ?: "/", + p_url->psz_path ? p_url->psz_path : "/", psz_response, /* Optional parameters */ p_auth->psz_algorithm ? "algorithm=\"" : "", - p_auth->psz_algorithm ?: "", + p_auth->psz_algorithm ? p_auth->psz_algorithm : "", p_auth->psz_algorithm ? "\", " : "", p_auth->psz_cnonce ? "cnonce=\"" : "", - p_auth->psz_cnonce ?: "", + p_auth->psz_cnonce ? p_auth->psz_cnonce : "", p_auth->psz_cnonce ? "\", " : "", p_auth->psz_opaque ? "opaque=\"" : "", - p_auth->psz_opaque ?: "", + p_auth->psz_opaque ? p_auth->psz_opaque : "", p_auth->psz_opaque ? "\", " : "", p_auth->psz_qop ? "qop=\"" : "", - p_auth->psz_qop ?: "", + p_auth->psz_qop ? p_auth->psz_qop : "", p_auth->psz_qop ? "\", " : "", p_auth->i_nonce ? "nc=\"" : "uglyhack=\"", /* Will be parsed as an unhandled extension */ p_auth->i_nonce,