[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] admin/web/build/mserver toc.js,1.17.2.4,1.17.2.5
From:       packard () helixcommunity ! org
Date:       2012-08-29 9:51:23
[Download RAW message or body]

Update of /cvsroot/server/admin/web/build/mserver
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv26425

Modified Files:
      Tag: SERVER_15_0
	toc.js 
Log Message:

Synopsis
========
Branches: Head, SERVER_15_0_RN

suggest reviewer: Chytanya, Xiaocheng Li, Any One

Description
===================
Description:
Change license to which do not have var"Time Shifting",with this license ,there \
should not be "Time Shifting"function,but it's still work.

Precondition:
Change License.

Repro:
1, Ingressing a live feed via Helix Push.
2, Change License to which not do have var "Time Shifting"
3, Restart server
4, Check Admin page.

Expected:
Server do not have "Time Shifting "feature.

Actual:
"Time Shifting"feature still on admin page and still work.

Other Comments:
No http response at all in the Wireshark log

Version:   servproxyall-081412-18311

Platform:  
Win2008/RHEL/Solaris

Config:

The root cause is that, I haven't add license check in hls time shift, now I will \
check whether license is enable time shift or not before handling time shift request.

Files affected
==================
server/admin/web/src/srvprxy/toc~server.js.wasm
server/admin/web/build/mserver/toc.js
server/admin/web/build/server/toc.js
server-restricted/protocol/http-ctrl/pub/hlstimeshift.h
server-restricted/protocol/http-ctrl/hlstimeshiftutil.cpp
server_rn/datatype/mpeg2ts/streamhandler.cpp

Test perform
==================
1. using a time shift disable license. check the admin page and found time shifting \
page dispear.

2.request a time shit live feed by URL: \
http://server/m3ugen/broadcast/test?shift&guid=1234 this request will turn into a \
normall hls live request and client will play the feed as a hls live feed.

3.client request a time shift seek by url: \
http://server/m3ugen/broadcast/test?shift&guid=1234&seek=_100 client can not seek \
back, but play the feed as a normal hls live feed.

4. using a time shift enable license, check the admin page and found time shifting \
page can display normally.

5.request a time shit live feed by URL: \
http://server/m3ugen/broadcast/test?shift&guid=1234, client can play the time shit \
feed normally.

6.request a time shit live feed seek by URL: \
http://server/m3ugen/broadcast/test?shift&guid=1234&seek=_100 client can play the \
feed back from 10 segments before 


Index: toc.js
===================================================================
RCS file: /cvsroot/server/admin/web/build/mserver/toc.js,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -u -d -r1.17.2.4 -r1.17.2.5
--- toc.js	27 Aug 2012 06:04:17 -0000	1.17.2.4
+++ toc.js	29 Aug 2012 09:51:16 -0000	1.17.2.5
@@ -44,7 +44,7 @@
 	new TOCLinkLicensed( "Flash Live Streams", "config_broad_rtmp_ingress.html", \
tmpParent, "DataTypes.RTMPIngress.Enabled", true );  new TOCLinkLicensed( "MPEG2-TS \
Live Streams", "config_broad_mpeg2ts_ingress.html", tmpParent, \
"DataTypes.MPEG2TSIngress.Enabled");	  new TOCLink( "Windows Media Live Streams", \
                "config_broad_wm.html", tmpParent );
-	new TOCLink( "HLS Time Shifting", "config_broad_hls.html", tmpParent);
+	new TOCLinkLicensed( "HLS Time Shifting", "config_broad_hls.html", tmpParent, \
"General.HLSTimeShifting");  new TOCLink( "Broadcast Archiving ", \
"config_broad_archive.html", tmpParent );  new TOCLinkLicensed( "Encoder Redundancy", \
"config_broad_redun.html", tmpParent, "BroadcastRedundancy.Enabled", true );  
@@ -53,8 +53,8 @@
 
 	new TOCLinkLicensed( "Transmitter Setup", "config_spl_dist.html", tmpParent, \
"BroadcastDistribution.PushTransmissionEnabled" );  new TOCLinkLicensed( "Receiver \
Setup", "config_spl_recv.html", tmpParent, "BroadcastDistribution.PushReceiveEnabled" \
                );
-	new TOCLinkLicensed( "HLS Push", "config_broad_push2cdn.html", tmpParent, \
                "General.HLS2CDNSupport", true );
-	new TOCLinkLicensed( "RTMP Push", "config_broad_rtmp_send.html", tmpParent, \
"General.HLS2CDNSupport", true ); +	new TOCLinkLicensed( "HLS Push", \
"config_broad_push2cdn.html", tmpParent, "General.HLS2CDNSupport"); +	new \
TOCLinkLicensed( "RTMP Push", "config_broad_rtmp_send.html", tmpParent, \
"General.RTMP2CDNSupport");  new TOCLinkLicensed( "Scalable Multicasting", \
"config_mc_scale.html", tmpParent, "Multicast.Scalable" );  new TOCLinkLicensed( \
"Back-Channel Multicasting", "config_mc_bc.html", tmpParent, "Multicast.General" );  \
new TOCLinkLicensed( "Windows Media Multicasting", "config_mc_wm.html", tmpParent, \
"Multicast.WindowsMedia" );


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


[prev in list] [next in list] [prev in thread] [next in thread]