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

List:       helix-server-cvs
Subject:    [Server-cvs] protocol/http httpprot.cpp,1.178,1.179
From:       tniu () helixcommunity ! org
Date:       2013-07-19 12:31:19
[Download RAW message or body]

Update of /cvsroot/server/protocol/http
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv29900

Modified Files:
	httpprot.cpp 
Log Message:


Synopsis
========
This CR fix bug: ( HLXSRV-536) [vhost][IP Binding] RTMP,MPTS ingress can be pushed to \
vhost account when this account contain no Binding IP. \
(http://jira.real.com/browse/HLXSRV-536)

Branch : SERVER_15_1_0_RN, HEAD

Suggested Reviewer : Anyone

Description
===========
Precondition:
1.Enable vhost mode and IP binding.
2.Set Binding IP blank.
 for example: <Var ServerIP=""/>
3.Set RTMP,MPTS ingress enable.
4.Push a RTMP,MPTS ingress strem to vhost account.
5.Check the ingress stream.

Actual:
The vhost account can recieve RTMP,MPTS stream when there is no binding IP at \
rmserver.cfg of this vhost account. 

Expected:
RTMP,MPTS stream can not be pushed to vhost account.

My solution:
Use strcmp() instean of strncmp();

Files Affected
==============
 server/protocol/rtsp/crtspbase.cpp
 server/protocol/http/httpprot.cpp
 server_rn/protocol/flash/rtmpserv/rtmpencoder.cpp
 server_rn/protocol/flash/rtmpserv/rtmpserv.cpp
 server_rn/broadcast/transport/mpeg2ts/recv/sourcehandler.cpp
 server_rn/broadcast/transport/mms/recv/wmsrcobj.cpp
 server_rn/protocol/wmt/http/wmt_httpprot.cpp

Test perform
================
Integration Tests:
N/A.

Performance Tests: 
N/A

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



Index: httpprot.cpp
===================================================================
RCS file: /cvsroot/server/protocol/http/httpprot.cpp,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- httpprot.cpp	18 Jul 2013 04:16:49 -0000	1.178
+++ httpprot.cpp	19 Jul 2013 12:31:11 -0000	1.179
@@ -4275,8 +4275,8 @@
         }
         else if (m_pVhostAccount 
                 && pServerIP
-                && !strncmp((const char*)sBindingIP, \
-                        (const char*)pServerIP->GetBuffer(), \
sBindingIP.GetLength())) +                && (sBindingIP.GetLength()>0)
+                && !strcmp((const char*)sBindingIP, (const \
char*)pServerIP->GetBuffer()))  {
             bRet = TRUE;
         }


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