stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

webui: show username, hostname and client name when subscribing to a complete mux

Browse source
This commit is contained in:
John Törnblom 2013-01-09 16:00:57 +01:00
parent f2d6ef4aa0
commit ea0d6918ff
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/dvb/dvb.h
View file

@ -548,7 +548,10 @@ void dvb_lnb_get_frequencies(const char *id,
struct th_subscription;
struct th_subscription *dvb_subscription_create_from_tdmi(th_dvb_mux_instance_t *tdmi,
const char *name,
streaming_target_t *st);
streaming_target_t *st,
const char *hostname,
const char *username,
const char *client);
#endif /* DVB_H_ */

7
src/dvb/dvb_multiplex.c
View file

@ -1293,13 +1293,16 @@ th_dvb_mux_instance_t *dvb_mux_find
th_subscription_t *
dvb_subscription_create_from_tdmi(th_dvb_mux_instance_t *tdmi,
const char *name,
streaming_target_t *st)
streaming_target_t *st,
const char *hostname,
const char *username,
const char *client)
{
th_subscription_t *s;
th_dvb_adapter_t *tda = tdmi->tdmi_adapter;
s = subscription_create(INT32_MAX, name, st, SUBSCRIPTION_RAW_MPEGTS,
NULL, NULL, NULL, NULL);
NULL, hostname, username, client);
s->ths_tdmi = tdmi;

5
src/webui/webui.c
View file

@ -638,7 +638,10 @@ http_stream_tdmi(http_connection_t *hc, th_dvb_mux_instance_t *tdmi)
const char *name;
streaming_queue_init(&sq, SMT_PACKET);
s = dvb_subscription_create_from_tdmi(tdmi, "HTTP", &sq.sq_st);
s = dvb_subscription_create_from_tdmi(tdmi, "HTTP", &sq.sq_st,
inet_ntoa(hc->hc_peer->sin_addr),
hc->hc_username,
http_arg_get(&hc->hc_args, "User-Agent"));
name = strdupa(tdmi->tdmi_identifier);
pthread_mutex_unlock(&global_lock);
http_stream_run(hc, &sq, name, MC_PASS, 1);