Changeset 730

Timestamp:

01/30/12 00:32:16 (4 months ago)

Author:

shiretu

Message:

-- fixed a bug in RTMP uri parsing
-- fixed some issues inside config files

Files:

• branches/1.0/sources/common/src/utils/misc/uri.cpp (modified) (1 diff)
• trunk/builders/cmake/crtmpserver/crtmpserver.lua (modified) (1 diff)
• trunk/configs/all.debug.lua (modified) (2 diffs)
• trunk/configs/flvplayback.lua (modified) (1 diff)
• trunk/sources/common/src/utils/misc/uri.cpp (modified) (1 diff)

branches/1.0/sources/common/src/utils/misc/uri.cpp

@@ -204 +204 @@
                 }
 
-                for (string::size_type i = fullDocumentPath.size() - 1; i >= 0; i--) {
-                        if (fullDocumentPath[i] == '/')
-                                break;
-                        document = fullDocumentPath[i] + document;
-                }
-                documentPath = fullDocumentPath.substr(0, fullDocumentPath.size() - document.size());
+                bool rtmpDocument = false;
+
+                if (scheme.find("rtmp") == 0) {
+                        pos = fullDocumentPath.find(':');
+                        if (pos == string::npos) {
+                                rtmpDocument = false;
+                        } else {
+                                pos = fullDocumentPath.rfind('/', pos);
+                                if (pos == string::npos) {
+                                        rtmpDocument = false;
+                                } else {
+                                        rtmpDocument = true;
+                                }
+                        }
+                } else {
+                        rtmpDocument = false;
+                }
+
+                if (rtmpDocument) {
+                        pos = fullDocumentPath.find(':');
+                        pos = fullDocumentPath.rfind('/', pos);
+                        documentPath = fullDocumentPath.substr(0, pos + 1);
+                        document = fullDocumentPath.substr(pos + 1);
+                } else {
+                        for (string::size_type i = fullDocumentPath.size() - 1; i >= 0; i--) {
+                                if (fullDocumentPath[i] == '/')
+                                        break;
+                                document = fullDocumentPath[i] + document;
+                        }
+                        documentPath = fullDocumentPath.substr(0, fullDocumentPath.size() - document.size());
+                }
                 documentWithFullParameters = document;
                 if (fullParameters != "")

trunk/builders/cmake/crtmpserver/crtmpserver.lua

@@ -152 +152 @@
                                         uri="rtmp://edge01.fms.dutchview.nl/botr/bunny",
                                         localStreamName="rtmp_test",
-                                        swfUrl="http://www.example.com/example.swf";
-                                        pageUrl="http://www.example.com/";
+                                        swfUrl="http://www.example.com/example.swf",
+                                        pageUrl="http://www.example.com/",
+                                        tcUrl="rtmp://edge01.fms.dutchview.nl/botr/bunny", --this one is usually required and should have the same value as the uri
                                         emulateUserAgent="MAC 10,1,82,76",
                                 }]]--

trunk/configs/all.debug.lua

@@ -150 +150 @@
                                         localStreamName="stream6",
                                         emulateUserAgent="MAC 10,1,82,76",
+                                        tcUrl="rtmp://edge01.fms.dutchview.nl/botr/bunny", --this one is usually required and should have the same value as the uri
                                 }
                                 {
                                         uri="rtmp://edge01.fms.dutchview.nl/botr/bunny",
                                         localStreamName="stream6",
-                                        swfUrl="http://www.example.com/example.swf";
-                                        pageUrl="http://www.example.com/";
+                                        swfUrl="http://www.example.com/example.swf",
+                                        pageUrl="http://www.example.com/",
                                         emulateUserAgent="MAC 10,1,82,76",
+                                        tcUrl="rtmp://edge01.fms.dutchview.nl/botr/bunny", --this one is usually required and should have the same value as the uri
                                 }
                                 ]]--
@@ -314 +316 @@
                         randomAccessStreams=false
                 },
-                {
-                        name="applestreamingclient",
-                        description="Apple Streaming Client",
-                        protocol="dynamiclinklibrary",
-                        --[[acceptors = 
-                        {
-                                {
-                                        ip="0.0.0.0",
-                                        port=5544,
-                                        protocol="inboundRtsp"
-                                }
-                        },]]--
-                        aliases=
-                        {
-                                "asc",
-                        },
-                        --validateHandshake=true,
-                        --default=true,
-                },
                 --[[{
                         name="vmapp",

trunk/configs/flvplayback.lua

@@ -80 +80 @@
                                         uri="rtmp://edge01.fms.dutchview.nl/botr/bunny",
                                         localStreamName="test1",
+                                        tcUrl="rtmp://edge01.fms.dutchview.nl/botr/bunny", --this one is usually required and should have the same value as the uri
                                 }]]--
                         },

trunk/sources/common/src/utils/misc/uri.cpp

@@ -204 +204 @@
                 }
 
-                for (string::size_type i = fullDocumentPath.size() - 1; i >= 0; i--) {
-                        if (fullDocumentPath[i] == '/')
-                                break;
-                        document = fullDocumentPath[i] + document;
-                }
-                documentPath = fullDocumentPath.substr(0, fullDocumentPath.size() - document.size());
+                bool rtmpDocument = false;
+
+                if (scheme.find("rtmp") == 0) {
+                        pos = fullDocumentPath.find(':');
+                        if (pos == string::npos) {
+                                rtmpDocument = false;
+                        } else {
+                                pos = fullDocumentPath.rfind('/', pos);
+                                if (pos == string::npos) {
+                                        rtmpDocument = false;
+                                } else {
+                                        rtmpDocument = true;
+                                }
+                        }
+                } else {
+                        rtmpDocument = false;
+                }
+
+                if (rtmpDocument) {
+                        pos = fullDocumentPath.find(':');
+                        pos = fullDocumentPath.rfind('/', pos);
+                        documentPath = fullDocumentPath.substr(0, pos + 1);
+                        document = fullDocumentPath.substr(pos + 1);
+                } else {
+                        for (string::size_type i = fullDocumentPath.size() - 1; i >= 0; i--) {
+                                if (fullDocumentPath[i] == '/')
+                                        break;
+                                document = fullDocumentPath[i] + document;
+                        }
+                        documentPath = fullDocumentPath.substr(0, fullDocumentPath.size() - document.size());
+                }
                 documentWithFullParameters = document;
                 if (fullParameters != "")