Changeset 735

Timestamp:

02/04/12 00:28:35 (4 months ago)

Author:

shiretu

Message:

-- properly branded

Location:

trunk

Files:

• 3rdparty/tinyxml/tinyxml.h (modified) (1 diff)
• cleanup.sh (modified) (2 diffs)
• constants/constants.lua (modified) (4 diffs)
• sources/common/include/defines.h (modified) (5 diffs)
• sources/thelib/src/protocols/cli/inboundbasecliprotocol.cpp (modified) (1 diff)
• sources/thelib/src/protocols/rtmp/basertmpappprotocolhandler.cpp (modified) (1 diff)
• sources/thelib/src/protocols/rtp/basertspappprotocolhandler.cpp (modified) (1 diff)

trunk/3rdparty/tinyxml/tinyxml.h

@@ -40 +40 @@
 #include <iostream>
 #include <sstream>
+using namespace std;
 
 // Help out windows:

trunk/cleanup.sh

@@ -12 +12 @@
 #       for i in `find  . -type f -name "$name"`;do  rm -rf  $i;done
 #done
-
+ 
 
 
@@ -71 +71 @@
 for i in `find  ./ -type f -name "*.o"`;do  rm -rf  $i;done
 for i in `find  ./ -type f -name "*.deb"`;do  rm -rf  $i;done
+for i in `find . -type f -name "evostream\.[0-9]*\.[0-9]*"`;do  rm -rf  $i;done
 

trunk/constants/constants.lua

@@ +1 @@
+BRANDING_COMPANY_NAME="C++ RTMP Server"
+BRANDING_WEB="www.rtmpd.com"
+BRANDING_EMAIL="contact@rtmpd.com"
+BRANDING_PRODUCT_NAME=BRANDING_COMPANY_NAME
+BRANDING_WEB_HTTP="http://"..BRANDING_WEB
+BRANDING_BANNER=BRANDING_PRODUCT_NAME.." ("..BRANDING_WEB..")"
+
 constants={
+BRANDING_COMPANY_NAME=BRANDING_COMPANY_NAME,
+BRANDING_WEB=BRANDING_WEB,
+BRANDING_EMAIL=BRANDING_EMAIL,
+BRANDING_PRODUCT_NAME=BRANDING_PRODUCT_NAME,
+BRANDING_WEB_HTTP=BRANDING_WEB_HTTP,
+BRANDING_BANNER=BRANDING_BANNER,
 --configuration,
 CONF_DAEMON="daemon",
@@ -69 +82 @@
 CONF_PROTOCOL_INBOUND_RAW_HTTP_STREAM="inboundRawHttpStream",
 CONF_PROTOCOL_INBOUND_RAW_HTTPS_STREAM="inboundRawHttpsStream",
+
+-- Pass-Through protocols
+CONF_PROTOCOL_UDP_PASSTHROUGH="udpPassThrough",
+CONF_PROTOCOL_TCP_PASSTHROUGH="tcpPassThrough",
 
 CONF_NUMBER_OF_THREADS="numberOfThreads",
@@ -167 +184 @@
 HTTP_HEADERS_CACHE_CONTROL_NO_CACHE="no-cache",
 HTTP_HEADERS_SERVER="Server",
-HTTP_HEADERS_SERVER_US="C++ RTMP Server (http://www.rtmpd.com)",
+HTTP_HEADERS_SERVER_US=BRANDING_BANNER,
 HTTP_HEADERS_X_POWERED_BY="X-Powered-By",
-HTTP_HEADERS_X_POWERED_BY_US="C++ RTMP Server (http://www.rtmpd.com)",
+HTTP_HEADERS_X_POWERED_BY_US=BRANDING_BANNER,
 HTTP_HEADERS_TRANSFER_ENCODING="Transfer-Encoding",
 HTTP_HEADERS_TRANSFER_ENCODING_CHUNKED="chunked",
@@ -194 +211 @@
 RTSP_HEADERS_CONTENT_LENGTH="Content-Length",
 RTSP_HEADERS_SERVER="Server",
-RTSP_HEADERS_SERVER_US="C++ RTMP Server (http://www.rtmpd.com)",
+RTSP_HEADERS_SERVER_US=BRANDING_BANNER,
 RTSP_HEADERS_X_POWERED_BY="X-Powered-By",
-RTSP_HEADERS_X_POWERED_BY_US="C++ RTMP Server (http://www.rtmpd.com)",
+RTSP_HEADERS_X_POWERED_BY_US=BRANDING_BANNER,
 RTSP_HEADERS_RANGE="Range",
 RTSP_HEADERS_RANGE_NOW="now",

trunk/sources/common/include/defines.h

@@ -21 +21 @@
 #define AM_SERVERID "serverId"
 #define AM_SERVERID_LEN 8
+#define BRANDING_BANNER "C++ RTMP Server (www.rtmpd.com)"
+#define BRANDING_BANNER_LEN 31
+#define BRANDING_COMPANY_NAME "C++ RTMP Server"
+#define BRANDING_COMPANY_NAME_LEN 15
+#define BRANDING_EMAIL "contact@rtmpd.com"
+#define BRANDING_EMAIL_LEN 17
+#define BRANDING_PRODUCT_NAME "C++ RTMP Server"
+#define BRANDING_PRODUCT_NAME_LEN 15
+#define BRANDING_WEB "www.rtmpd.com"
+#define BRANDING_WEB_LEN 13
+#define BRANDING_WEB_HTTP "http://www.rtmpd.com"
+#define BRANDING_WEB_HTTP_LEN 20
 #define CM "controlMessage"
 #define CM_LEN 14
@@ -377 +389 @@
 #define HTTP_HEADERS_SERVER "Server"
 #define HTTP_HEADERS_SERVER_LEN 6
-#define HTTP_HEADERS_SERVER_US "EVOSTREAM Streaming Router (www.evostream.com)"
-#define HTTP_HEADERS_SERVER_US_LEN 46
+#define HTTP_HEADERS_SERVER_US "C++ RTMP Server (www.rtmpd.com)"
+#define HTTP_HEADERS_SERVER_US_LEN 31
 #define HTTP_HEADERS_TRANSFER_ENCODING "Transfer-Encoding"
 #define HTTP_HEADERS_TRANSFER_ENCODING_LEN 17
@@ -389 +401 @@
 #define HTTP_HEADERS_X_POWERED_BY "X-Powered-By"
 #define HTTP_HEADERS_X_POWERED_BY_LEN 12
-#define HTTP_HEADERS_X_POWERED_BY_US "EVOSTREAM Streaming Router (www.evostream.com)"
-#define HTTP_HEADERS_X_POWERED_BY_US_LEN 46
+#define HTTP_HEADERS_X_POWERED_BY_US "C++ RTMP Server (www.rtmpd.com)"
+#define HTTP_HEADERS_X_POWERED_BY_US_LEN 31
 #define HTTP_METHOD "method"
 #define HTTP_METHOD_LEN 6
@@ -747 +759 @@
 #define RTSP_HEADERS_SERVER "Server"
 #define RTSP_HEADERS_SERVER_LEN 6
-#define RTSP_HEADERS_SERVER_US "EVOSTREAM Streaming Router (www.evostream.com)"
-#define RTSP_HEADERS_SERVER_US_LEN 46
+#define RTSP_HEADERS_SERVER_US "C++ RTMP Server (www.rtmpd.com)"
+#define RTSP_HEADERS_SERVER_US_LEN 31
 #define RTSP_HEADERS_SESSION "Session"
 #define RTSP_HEADERS_SESSION_LEN 7
@@ -755 +767 @@
 #define RTSP_HEADERS_X_POWERED_BY "X-Powered-By"
 #define RTSP_HEADERS_X_POWERED_BY_LEN 12
-#define RTSP_HEADERS_X_POWERED_BY_US "EVOSTREAM Streaming Router (www.evostream.com)"
-#define RTSP_HEADERS_X_POWERED_BY_US_LEN 46
+#define RTSP_HEADERS_X_POWERED_BY_US "C++ RTMP Server (www.rtmpd.com)"
+#define RTSP_HEADERS_X_POWERED_BY_US_LEN 31
 #define RTSP_METHOD "method"
 #define RTSP_METHOD_LEN 6

trunk/sources/thelib/src/protocols/cli/inboundbasecliprotocol.cpp

@@ -22 +22 @@
 #include "application/clientapplicationmanager.h"
 #include "protocols/cli/basecliappprotocolhandler.h"
-#include "netio/netio.h"
 
 InboundBaseCLIProtocol::InboundBaseCLIProtocol(uint64_t type)

trunk/sources/thelib/src/protocols/rtmp/basertmpappprotocolhandler.cpp

@@ -972 +972 @@
         //1. Read stream index and offset in millisecond
         uint32_t streamId = VH_SI(request);
-        double timeOffset = 0.0;
-        if ((VariantType) M_INVOKE_PARAM(request, 1) == V_DOUBLE)
-                timeOffset = M_INVOKE_PARAM(request, 1);
 
         //2. Find the corresponding outbound stream

trunk/sources/thelib/src/protocols/rtp/basertspappprotocolhandler.cpp

@@ -1657 +1657 @@
         result += format("o=- %"PRIu32" 0 IN IP4 %s\r\n", pFrom->GetId(), STR(nearAddress));
         result += "s=" + targetStreamName + "\r\n";
-        result += "u=www.evostream.com\r\n";
-        result += "e=contact@evostream.com\r\n";
+        result += "u="BRANDING_WEB"\r\n";
+        result += "e="BRANDING_EMAIL"\r\n";
         result += "c=IN IP4 " + nearAddress + "\r\n";
         result += "t=0 0\r\n";