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

List:       helix-server-cvs
Subject:    [Server-cvs] engine/core/pub vhost.h,1.1.2.1,1.1.2.2
From:       tniu () helixcommunity ! org
Date:       2013-04-27 11:44:05
[Download RAW message or body]

Update of /cvsroot/server/engine/core/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv26471/pub

Modified Files:
      Tag: SERVER_VHOST_YIJI_2
	vhost.h 
Log Message:

Synopsis
========
License extension for vhost.

Branches: SERVER_VHOST_YIJI_2
Suggested Reviewers: Anyone 

Description
===========
If vhost is disabled in license, or account number configured in rmserver.cfg exceed \
license limit, whether enable vhost or not in rmserver.cfg, it can't be used.

Files Affected
==============
server-restricted/protocol/http-ctrl/baseswitchhandler.cpp
server-restricted/broadcast/transport/bcng/recv/strmhand.cpp
server-restricted/fs/encfs/encfobj.cpp
server/protocol/rtsp/crtspbase.cpp
server/protocol/http/httpprot.cpp
server/protocol/http/http_demux.cpp
server/include/hxvhost.h
server/engine/core/pub/vhost.h
server/engine/core/vhost.cpp
server_rn/protocol/flash/rtmpserv/pub/rtmpserv.h
server_rn/protocol/flash/rtmpserv/rtmpserv.cpp
server_rn/vhost/vhostplgn/pub/vhostplin.h
server_rn/vhost/vhostplgn/vhostplin.cpp
server_rn/broadcast/transport/rtmp/recv/pub/rtmplivepln.h
server_rn/broadcast/transport/rtmp/recv/rtmplivepln.cpp
server_rn/protocol/wmt/http/wmt_httpprot.cpp
server_rn/broadcast/transport/mms/recv/wmsrcobj.cpp
common/include/defslice.h
v1502_allon_signed.lic

Testing Performed
=================
Platforms Tested: win64-x86-vc7
Build verified: win32-i386-vc7
Test case: rtp, rtmp,rbs, wmt, hls

QA Hints
========
None

Index: vhost.h
===================================================================
RCS file: /cvsroot/server/engine/core/pub/Attic/vhost.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- vhost.h	21 Apr 2013 13:22:49 -0000	1.1.2.1
+++ vhost.h	27 Apr 2013 11:43:52 -0000	1.1.2.2
@@ -55,6 +55,7 @@
     STDMETHOD(GetVhostInfo)     (THIS_
                                 IHXRequest* pRequest,
                                 REF(IHXValues*) pValues);
+    STDMETHOD_(HXBOOL, IsLicenseEnabled)     (THIS);
 
 private:
     UINT32                          m_ulRefCount;


_______________________________________________
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]