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

List:       helix-server-cvs
Subject:    [Server-cvs] license/slicensepln/pub server_license.h,1.10,1.11
From:       yijil () helixcommunity ! org
Date:       2013-12-13 10:12:37
[Download RAW message or body]

Update of /cvsroot/server/license/slicensepln/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv10141/pub

Modified Files:
	server_license.h 
Log Message:
Committed to: HEAD, SERVER_15_1_0_RN

Reviewed by: Richard

Synopsis
========
Helix ServerHLXSRV-813 [RTSP Ingest][Vhost]The limitation in vhost is not take effect \
for RTSP ingest

Branches: HEAD, SERVER_15_1_0_RN

Reviewer: Anyone

Description
===========
Repro (100%): 
 1. Enable the Vhost mode and set the limitation for account "brianrhel601"
 <List Name="Vhost">
 <Var EnableVhost="1"/>
 <Var EnableIPBinding="0"/>
 <Var VhostMode="1"/>
 <Var Password="real"/>
 <Var VhostDirectory="/var/hms/Vhost"/>
 <Var CalcDiskInterval="60000"/>
 <List Name="brianrhel601">
 <Var ServerIP=""/>
 <Var DiskUsageWarningSize="0"/>
 <Var MaxInBandwidth="0"/>
 <Var MaxOutBandwidth="0"/>
 <Var CNAME="brianrhel601.qacn.com"/>
 <Var ResourceLimitationVhost="2"/>
 <Var MaxIngressCount="1"/>
 <Var MaxClientCount="0"/>
 </List>
 </List>
 2. In account, setup some RTSP ingest sources on the server  There is no value in \
StreamName setting  <List Name="RTSP_Ingest">  <Var GlobalEnable="1"/>  <Var \
InitialTimeout="10"/>  <Var SourceScanInterval="60"/>  <Var StreamTimeout="5"/>  <Var \
DebugLevel="0"/>  <List Name="Source1">  <Var \
StreamURL="rtsp://192.168.36.43/broadcast/rbslive1"/>  <Var Enable="1"/>
 <Var StreamName=""/>
 <Var Password="hms"/>
 <Var UserName="hms"/>
 </List>
 ...
 </List>
 3. Start 5 RTSP streams one by one

Platform: RHEL6

Actual:
 1. Could receive all streams
Expected:
 1. Only could receive the 1st stream

My Fix:
Add check in RtspIngestSourceHandlerAddNewFileCallback::Func().

Files Affected
==============
server_rn/broadcast/transport/rtsp/recv/rtspingestpln.cpp
server_rn/broadcast/transport/rtsp/recv/rtspingestworkercb.cpp
server_rn/broadcast/transport/rtsp/recv/pub/rtspingestworkercb.h

Testing Performed
=================
Integration Tests




Index: server_license.h
===================================================================
RCS file: /cvsroot/server/license/slicensepln/pub/server_license.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- server_license.h	29 May 2013 10:47:54 -0000	1.10
+++ server_license.h	13 Dec 2013 10:12:34 -0000	1.11
@@ -45,7 +45,15 @@
     AWSMetaData_InstanceID,
 }AWSMetaDataType;
 
+#define CPN_LICENSE_IP  "50.62.149.14"
+#define CPN_LICENSE_HOST "services.computenext.com"
+#define CPN_LICENSE_URI "/apiv1.0/virtualmachines/license"
+#define CPN_ACCESS_KEY  "44eae63a-9c12-4d49-a7d2-ea7ea468a8af"
+#define CPN_SECRET_KEY  "5ee66863-5405-43e7-b451-424786abc47d"
+#define HTTP_PORT 80
+#define HTTPS_PORT 443
 
+class CHXPtrArray;
 class ServerLicense {
 public:
     ServerLicense(IUnknown* pContext);
@@ -110,14 +118,17 @@
 					 UINT32& ulDay, 
 					 UINT32& ulYear);
 
+    HX_RESULT ValidateAWS(AWSMetaDataType eType, const char* pMainRegKey);
+    HX_RESULT ValidateComputNext(const char* pMainRegKey, HXBOOL bCPN);
     HXBOOL GetAWSMetaData( AWSMetaDataType etype, IHXBuffer*pBuffer);
     void LICENSE_ERRMSG(const char* fmt, ...);
 
-    IHXRegistry2* m_pRegistry;
-    IHXErrorMessages* m_pErrHandler;
-    IHXCommonClassFactory* m_pClassFactory; 
-    IHXProductVersion* m_pProductVersion;
-    IUnknown* m_pContext;
+    IHXRegistry2*                   m_pRegistry;
+    IHXErrorMessages*               m_pErrHandler;
+    IHXCommonClassFactory*          m_pClassFactory; 
+    IHXProductVersion*              m_pProductVersion;
+    IUnknown*                       m_pContext;
+    CHXPtrArray*                    m_pAddrArray;
 
     UINT32	    m_ulLicenseIndex;
     BOOL	    m_bDisableAggregation;


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