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

List:       helix-server-cvs
Subject:    [Server-cvs] admin/web/src/srvprxy config_broad_mpeg2ts_ingress.html.wasm, 1.8, 1.9
From:       packard () helixcommunity ! org
Date:       2012-08-29 8:12:42
[Download RAW message or body]

Update of /cvsroot/server/admin/web/src/srvprxy
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv6987

Modified Files:
	config_broad_mpeg2ts_ingress.html.wasm 
Log Message:
Synopsis:
=========
fix for Bug 270634:     [MPEG2-TS ingress]: Conflict with other feature's ports \
succeeds without warning 

Branch: SERVER_15_0_RN, HEAD

Suggested Reviewers:  Xiaocheng Li, Richard, Anyone

Description:
=========
Bug summary: When a mpeg2-ts ingress source uses a port range conflicting with other \
features, the server gives no warning but succeeds.


Solution
=========
adding port conflict checking just like other admin page features.


File Affected
=========
server/admin/web/src/srvprxy/config_broad_mpeg2ts_ingress.html.wasm
server/admin/web/build/server/config_broad_mpeg2ts_ingress.html
server/admin/web/build/mserver/config_broad_mpeg2ts_ingress.html



Testing Performed:
================
test with admin page, it could point out the conflict with other features.


QA Hints
========
None.


Index: config_broad_mpeg2ts_ingress.html.wasm
===================================================================
RCS file: /cvsroot/server/admin/web/src/srvprxy/config_broad_mpeg2ts_ingress.html.wasm,v
 retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- config_broad_mpeg2ts_ingress.html.wasm	19 Aug 2012 08:46:33 -0000	1.8
+++ config_broad_mpeg2ts_ingress.html.wasm	29 Aug 2012 08:12:34 -0000	1.9
@@ -52,10 +52,10 @@
     new PropObj('StreamTimeout', "5", false, true, 1, 99999, "int", "Stream Timeout" \
),     ];
 
-initAllPortsList( serverData);
 var propList = new PropList( "MPEG2TS_Ingress", mpeg2tsingress, propSetMain, \
propSetSources);  var propFSList = new PropList('MPEG2TS_Mount_Point', mptsfs , \
propFS, null);  
+initAllPortsList( serverData, "MPEG2TS_Ingress" );
 function MPEG2TSIngressPropView ()
 {
     this.base = NestedPropListView ;
@@ -106,6 +106,7 @@
     upper1 = getCtrlValue( theForm.PortRange1 )
     var conflict = 0;
     var subList = this.getSubList();
+    var errMsg = "port range can't overlap with other nodes";
     function checkMptsPortConflict( otherSubList, prop )
     {
         // don't compare this sublist with itself
@@ -115,12 +116,21 @@
 	{
 	    conflict = 1;
 	}				
+	if( conflict == 0 )
+	{
+		conflict = findPortConflictName( 
+				lower1, 
+				upper1 );
+		if ( conflict )
+		{
+			errMsg = getConflictErrMsg( conflict, "MPEG2 TS INGRESS Port Range" ) ;
+		}
+	}
     }
     propList.propSearch( "PortRange", checkMptsPortConflict );
     if ( conflict )
     {
-	this.errMsg = "port range can't overlap with other nodes";
-	return rejectInput( theForm["PortRange0"], this.errMsg );
+	return rejectInput( theForm["PortRange0"], errMsg );
     }
     setCtrlValue( theForm.PortRange, 
 		( ("" == getCtrlValue( theForm.PortRange0 )) ? "" :


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