123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168 |
- From 980fbe5397358cb97008a1bf4c57d0311284b6ec Mon Sep 17 00:00:00 2001
- From: Thomas Guillem <thomas@gllm.fr>
- Date: Fri, 16 Sep 2016 15:51:11 +0200
- Subject: [PATCH 02/17] libvlc_media: add cookie_jar API
- ---
- include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
- lib/libvlc.sym | 2 ++
- lib/media.c | 25 +++++++++++++++++++++++++
- lib/media_internal.h | 2 ++
- lib/media_player.c | 7 +++++++
- 5 files changed, 71 insertions(+)
- diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
- index 9f806a2e40..975a647305 100644
- --- a/include/vlc/libvlc_media.h
- +++ b/include/vlc/libvlc_media.h
- @@ -970,6 +970,41 @@ LIBVLC_API
- void libvlc_media_slaves_release( libvlc_media_slave_t **pp_slaves,
- unsigned int i_count );
-
- +/**
- + * Parse a value of an incoming Set-Cookie header (see RFC 6265) and append the
- + * cookie to the cookie jar if appropriate. The "secure" attribute can be added
- + * to psz_cookie to limit the scope of the cookie to secured channels (https).
- + *
- + * \note must be called before the first call of libvlc_media_player_play() to
- + * take effect. The cookie jar is only used for http/https accesses.
- + *
- + * \version LibVLC 3.0.0 and later.
- + *
- + * \param p_md media descriptor object
- + * \param psz_cookie header field value of Set-Cookie:
- + * "name=value<;attributes>" (must not be NULL)
- + * \param psz_host host to which the cookie will be sent (must not be NULL)
- + * \param psz_path scope of the cookie (must not be NULL)
- + *
- + * \return 0 on success, -1 on error.
- + */
- +LIBVLC_API int
- +libvlc_media_cookie_jar_store( libvlc_media_t *p_md, const char *psz_cookie,
- + const char *psz_host, const char *psz_path );
- +
- +/**
- + * Clear the cookie jar of a media.
- + *
- + * \note must be called before the first call of libvlc_media_player_play() to
- + * take effect.
- + *
- + * \version LibVLC 3.0.0 and later.
- + *
- + * \param p_md media descriptor object
- + */
- +LIBVLC_API void
- +libvlc_media_cookie_jar_clear( libvlc_media_t *p_md );
- +
- /** @}*/
-
- # ifdef __cplusplus
- diff --git a/lib/libvlc.sym b/lib/libvlc.sym
- index d8fb0806bc..e79a65a362 100644
- --- a/lib/libvlc.sym
- +++ b/lib/libvlc.sym
- @@ -189,6 +189,8 @@ libvlc_media_set_user_data
- libvlc_media_subitems
- libvlc_media_tracks_get
- libvlc_media_tracks_release
- +libvlc_media_cookie_jar_store
- +libvlc_media_cookie_jar_clear
- libvlc_new
- libvlc_playlist_play
- libvlc_release
- diff --git a/lib/media.c b/lib/media.c
- index f045c729d2..4bbd979986 100644
- --- a/lib/media.c
- +++ b/lib/media.c
- @@ -407,6 +407,7 @@ libvlc_media_t * libvlc_media_new_from_input_item(
- p_md->p_subitems = NULL;
-
- libvlc_event_manager_init( &p_md->event_manager, p_md );
- + p_md->p_cookie_jar = NULL;
-
- input_item_Hold( p_md->p_input_item );
-
- @@ -562,6 +563,9 @@ void libvlc_media_release( libvlc_media_t *p_md )
-
- input_item_Release( p_md->p_input_item );
-
- + if( p_md->p_cookie_jar )
- + vlc_http_cookies_destroy( p_md->p_cookie_jar );
- +
- vlc_cond_destroy( &p_md->parsed_cond );
- vlc_mutex_destroy( &p_md->parsed_lock );
- vlc_mutex_destroy( &p_md->subitems_lock );
- @@ -1347,3 +1351,24 @@ void libvlc_media_slaves_release( libvlc_media_slave_t **pp_slaves,
- }
- free( pp_slaves );
- }
- +
- +int
- +libvlc_media_cookie_jar_store( libvlc_media_t *p_md, const char *psz_cookie,
- + const char *psz_host, const char *psz_path )
- +{
- + if( !p_md->p_cookie_jar )
- + {
- + p_md->p_cookie_jar = vlc_http_cookies_new();
- + if( !p_md->p_cookie_jar )
- + return -1;
- + }
- + return vlc_http_cookies_store( p_md->p_cookie_jar, psz_cookie, psz_host,
- + psz_path ) ? 0 : -1;
- +}
- +
- +void
- +libvlc_media_cookie_jar_clear( libvlc_media_t *p_md )
- +{
- + if( p_md->p_cookie_jar )
- + vlc_http_cookies_clear( p_md->p_cookie_jar );
- +}
- diff --git a/lib/media_internal.h b/lib/media_internal.h
- index aefc731c68..e90248c91b 100644
- --- a/lib/media_internal.h
- +++ b/lib/media_internal.h
- @@ -29,6 +29,7 @@
-
- #include <vlc_common.h>
- #include <vlc_input.h>
- +#include <vlc_http.h>
-
- struct libvlc_media_t
- {
- @@ -47,6 +48,7 @@ struct libvlc_media_t
- libvlc_media_parsed_status_t parsed_status;
- bool is_parsed;
- bool has_asked_preparse;
- + vlc_http_cookie_jar_t *p_cookie_jar;
- };
-
- /* Media Descriptor */
- diff --git a/lib/media_player.c b/lib/media_player.c
- index cdb6ba0b8c..575632f2cd 100644
- --- a/lib/media_player.c
- +++ b/lib/media_player.c
- @@ -576,6 +576,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
- var_Create (mp, "rate", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT);
- var_Create (mp, "sout", VLC_VAR_STRING);
- var_Create (mp, "demux-filter", VLC_VAR_STRING);
- + var_Create (mp, "http-cookies", VLC_VAR_ADDRESS);
-
- /* Video */
- var_Create (mp, "vout", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
- @@ -913,6 +914,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
- vlc_player_t *player = p_mi->player;
- vlc_player_Lock(player);
-
- + if( p_mi->p_md->p_cookie_jar )
- + {
- + vlc_value_t cookies = { .p_address = p_mi->p_md->p_cookie_jar };
- + var_SetChecked( p_mi, "http-cookies", VLC_VAR_ADDRESS, cookies );
- + }
- +
- int ret = vlc_player_Start(player);
- if (ret == VLC_SUCCESS)
- {
- --
- 2.21.1 (Apple Git-122.3)
|