add http library, support in build script

trunk/auto/depends.sh

@@ -25,23 +25,25 @@ if [ ! -f ${SRS_OBJS}/st-1.9/obj/libst.so ]; then echo "build st-1.9 failed."; e
 #####################################################################################
 # http-parser-2.1
 #####################################################################################
-if [[ -f ${SRS_OBJS}/http-parser-2.1/http_parser.h && -f ${SRS_OBJS}/http-parser-2.1/libhttp_parser.a ]]; then
+if [ $SRS_HTTP = YES ]; then
-    echo "http-parser-2.1 is ok.";
+    if [[ -f ${SRS_OBJS}/http-parser-2.1/http_parser.h && -f ${SRS_OBJS}/http-parser-2.1/libhttp_parser.a ]]; then
-else
+        echo "http-parser-2.1 is ok.";
-    echo "build http-parser-2.1";
+    else
-    (
+        echo "build http-parser-2.1";
-        rm -rf ${SRS_OBJS}/http-parser-2.1 && cd ${SRS_OBJS} && unzip -q ../3rdparty/http-parser-2.1.zip && 
+        (
-        cd http-parser-2.1 && 
+            rm -rf ${SRS_OBJS}/http-parser-2.1 && cd ${SRS_OBJS} && unzip -q ../3rdparty/http-parser-2.1.zip && 
-        sed -i "s/CPPFLAGS_FAST +=.*$/CPPFLAGS_FAST = \$\(CPPFLAGS_DEBUG\)/g" Makefile &&
+            cd http-parser-2.1 && 
-        sed -i "s/CFLAGS_FAST =.*$/CFLAGS_FAST = \$\(CFLAGS_DEBUG\)/g" Makefile &&
+            sed -i "s/CPPFLAGS_FAST +=.*$/CPPFLAGS_FAST = \$\(CPPFLAGS_DEBUG\)/g" Makefile &&
-        make package &&
+            sed -i "s/CFLAGS_FAST =.*$/CFLAGS_FAST = \$\(CFLAGS_DEBUG\)/g" Makefile &&
-        cd .. && rm -f hp && ln -sf http-parser-2.1 hp
+            make package &&
-    )
+            cd .. && rm -f hp && ln -sf http-parser-2.1 hp
+        )
+    fi
+    # check status
+    ret=$?; if [[ $ret -ne 0 ]]; then echo "build http-parser-2.1 failed, ret=$ret"; exit $ret; fi
+    if [[ ! -f ${SRS_OBJS}/http-parser-2.1/http_parser.h ]]; then echo "build http-parser-2.1 failed"; exit -1; fi
+    if [[ ! -f ${SRS_OBJS}/http-parser-2.1/libhttp_parser.a ]]; then echo "build http-parser-2.1 failed"; exit -1; fi
 fi
-# check status
-ret=$?; if [[ $ret -ne 0 ]]; then echo "build http-parser-2.1 failed, ret=$ret"; exit $ret; fi
-if [[ ! -f ${SRS_OBJS}/http-parser-2.1/http_parser.h ]]; then echo "build http-parser-2.1 failed"; exit -1; fi
-if [[ ! -f ${SRS_OBJS}/http-parser-2.1/libhttp_parser.a ]]; then echo "build http-parser-2.1 failed"; exit -1; fi
 
 #####################################################################################
 # nginx for HLS, nginx-1.5.0

trunk/configure

@@ -95,13 +95,18 @@ END
 # Libraries
 LibSTRoot="${SRS_OBJS}/st"
 LibSTfile="${LibSTRoot}/libst.a"
-LibHttpParserRoot="${SRS_OBJS}/hp"
+if [ $SRS_HTTP = YES ]; then
-LibHttpParserfile="${LibHttpParserRoot}/libhttp_parser.a"
+    LibHttpParserRoot="${SRS_OBJS}/hp"
+    LibHttpParserfile="${LibHttpParserRoot}/libhttp_parser.a"
+fi
 
 #Core Module
 MODULE_ID="CORE" 
 MODULE_DEPENDS=() 
-ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS})
+ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS})
+if [ $SRS_HTTP = YES ]; then
+    ModuleLibIncs="${ModuleLibIncs[@]} ${LibHttpParserRoot}"
+fi
 MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server" 
         "srs_core_error" "srs_core_conn" "srs_core_client" 
         "srs_core_rtmp" "srs_core_socket" "srs_core_buffer"
@@ -109,7 +114,8 @@ MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server"
         "srs_core_stream" "srs_core_source" "srs_core_codec"
         "srs_core_handshake" "srs_core_pithy_print"
         "srs_core_config" "srs_core_refer" "srs_core_reload"
-        "srs_core_hls" "srs_core_forward" "srs_core_encoder")
+        "srs_core_hls" "srs_core_forward" "srs_core_encoder"
+        "srs_core_http")
 MODULE_DIR="src/core" . auto/modules.sh
 CORE_OBJS="${MODULE_OBJS[@]}"
 
@@ -125,7 +131,10 @@ MAIN_OBJS="${MODULE_OBJS[@].o}"
 MAIN_ENTRANCES=("srs_main_server")
 
 # srs(simple rtmp server) over st(state-threads)
-ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile})
+ModuleLibFiles=(${LibSTfile})
+if [ $SRS_HTTP = YES ]; then
+    ModuleLibFiles="${ModuleLibFiles[@]} ${LibHttpParserfile}"
+fi
 MODULE_OBJS="${CORE_OBJS[@]} ${CONFIG_OBJS[@]} ${PROTOCOL_OBJS[@]} ${MAIN_OBJS[@]}"
 if [ $SRS_SSL = YES ]; then
     LINK_OPTIONS="-ldl -lssl -lcrypto"

trunk/src/core/srs_core.cpp

@@ -1,113 +1,113 @@
-/*
+/*
-The MIT License (MIT)
+The MIT License (MIT)
-
+
-Copyright (c) 2013 winlin
+Copyright (c) 2013 winlin
-
+
-Permission is hereby granted, free of charge, to any person obtaining a copy of
+Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
+this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
+the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
+the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+subject to the following conditions:
-
+
-The above copyright notice and this permission notice shall be included in all
+The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+copies or substantial portions of the Software.
-
+
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+*/
-
+
-#include <srs_core.hpp>
+#include <srs_core.hpp>
-
+
-#include <sys/time.h>
+#include <sys/time.h>
-#include <netdb.h>
+#include <netdb.h>
-#include <arpa/inet.h>
+#include <arpa/inet.h>
-
+
-#include <srs_core_log.hpp>
+#include <srs_core_log.hpp>
-
+
-static int64_t _srs_system_time_us_cache = 0;
+static int64_t _srs_system_time_us_cache = 0;
-
+
-int64_t srs_get_system_time_ms()
+int64_t srs_get_system_time_ms()
-{
+{
-	return _srs_system_time_us_cache / 1000;
+	return _srs_system_time_us_cache / 1000;
-}
+}
-
+
-void srs_update_system_time_ms()
+void srs_update_system_time_ms()
-{
+{
-    timeval now;
+    timeval now;
-    
+    
-    gettimeofday(&now, NULL);
+    gettimeofday(&now, NULL);
-
+
-    // we must convert the tv_sec/tv_usec to int64_t.
+    // we must convert the tv_sec/tv_usec to int64_t.
-    _srs_system_time_us_cache = now.tv_sec * 1000 * 1000 + now.tv_usec;
+    _srs_system_time_us_cache = now.tv_sec * 1000 * 1000 + now.tv_usec;
-    
+    
-    _srs_system_time_us_cache = srs_max(0, _srs_system_time_us_cache);
+    _srs_system_time_us_cache = srs_max(0, _srs_system_time_us_cache);
-}
+}
-
+
-std::string srs_replace(std::string str, std::string old_str, std::string new_str)
+std::string srs_replace(std::string str, std::string old_str, std::string new_str)
-{
+{
-	std::string ret = str;
+	std::string ret = str;
-	
+	
-	if (old_str == new_str) {
+	if (old_str == new_str) {
-		return ret;
+		return ret;
-	}
+	}
-	
+	
-	size_t pos = 0;
+	size_t pos = 0;
-	while ((pos = ret.find(old_str, pos)) != std::string::npos) {
+	while ((pos = ret.find(old_str, pos)) != std::string::npos) {
-		ret = ret.replace(pos, old_str.length(), new_str);
+		ret = ret.replace(pos, old_str.length(), new_str);
-		pos += new_str.length();
+		pos += new_str.length();
-	}
+	}
-	
+	
-	return ret;
+	return ret;
-}
+}
-
+
-std::string srs_dns_resolve(std::string host)
+std::string srs_dns_resolve(std::string host)
-{
+{
-    if (inet_addr(host.c_str()) != INADDR_NONE) {
+    if (inet_addr(host.c_str()) != INADDR_NONE) {
-        return host;
+        return host;
-    }
+    }
-    
+    
-    hostent* answer = gethostbyname(host.c_str());
+    hostent* answer = gethostbyname(host.c_str());
-    if (answer == NULL) {
+    if (answer == NULL) {
-        srs_error("dns resolve host %s error.", host.c_str());
+        srs_error("dns resolve host %s error.", host.c_str());
-        return "";
+        return "";
-    }
+    }
-    
+    
-    char ipv4[16];
+    char ipv4[16];
-    memset(ipv4, 0, sizeof(ipv4));
+    memset(ipv4, 0, sizeof(ipv4));
-    for (int i = 0; i < answer->h_length; i++) {
+    for (int i = 0; i < answer->h_length; i++) {
-        inet_ntop(AF_INET, answer->h_addr_list[i], ipv4, sizeof(ipv4));
+        inet_ntop(AF_INET, answer->h_addr_list[i], ipv4, sizeof(ipv4));
-        srs_info("dns resolve host %s to %s.", host.c_str(), ipv4);
+        srs_info("dns resolve host %s to %s.", host.c_str(), ipv4);
-        break;
+        break;
-    }
+    }
-    
+    
-    return ipv4;
+    return ipv4;
-}
+}
-
+
-void srs_vhost_resolve(std::string& vhost, std::string& app)
+void srs_vhost_resolve(std::string& vhost, std::string& app)
-{
+{
-	app = srs_replace(app, "...", "?");
+	app = srs_replace(app, "...", "?");
-	
+	
-	size_t pos = 0;
+	size_t pos = 0;
-	if ((pos = app.find("?")) == std::string::npos) {
+	if ((pos = app.find("?")) == std::string::npos) {
-		return;
+		return;
-	}
+	}
-	
+	
-	std::string query = app.substr(pos + 1);
+	std::string query = app.substr(pos + 1);
-	app = app.substr(0, pos);
+	app = app.substr(0, pos);
-	
+	
-	if ((pos = query.find("vhost?")) != std::string::npos
+	if ((pos = query.find("vhost?")) != std::string::npos
-		|| (pos = query.find("vhost=")) != std::string::npos
+		|| (pos = query.find("vhost=")) != std::string::npos
-		|| (pos = query.find("Vhost?")) != std::string::npos
+		|| (pos = query.find("Vhost?")) != std::string::npos
-		|| (pos = query.find("Vhost=")) != std::string::npos
+		|| (pos = query.find("Vhost=")) != std::string::npos
-	) {
+	) {
-		query = query.substr(pos + 6);
+		query = query.substr(pos + 6);
-		if (!query.empty()) {
+		if (!query.empty()) {
-			vhost = query;
+			vhost = query;
-		}
+		}
-	}
+	}
-}
+}

trunk/src/core/srs_core_client.cpp

@@ -242,6 +242,15 @@ int SrsClient::check_vhost()
 		req->vhost = vhost->arg0();
 	}
 	
+#ifdef SRS_HTTP	
+	// HTTP: on_connect
+	std::string on_connect = config->get_vhost_on_connect(req->vhost);
+	if (on_connect.empty()) {
+		srs_info("ignore the empty http callback: on_connect");
+		return ret;
+	}
+#endif
+	
 	return ret;
 }
 

trunk/src/core/srs_core_http.cpp

@@ -0,0 +1,27 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013 winlin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <srs_core_http.hpp>
+
+#ifdef SRS_HTTP
+#endif

trunk/src/core/srs_core_http.hpp

@@ -0,0 +1,35 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013 winlin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef SRS_CORE_HTTP_HPP
+#define SRS_CORE_HTTP_HPP
+
+/*
+#include <srs_core_http.hpp>
+*/
+#include <srs_core.hpp>
+
+#ifdef SRS_HTTP
+#endif
+
+#endif

trunk/src/srs/srs.upp

@@ -22,6 +22,8 @@ file
 	..\core\srs_core_conn.cpp,
 	..\core\srs_core_client.hpp,
 	..\core\srs_core_client.cpp,
+        ..\core\srs_core_http.hpp,
+        ..\core\srs_core_http.cpp,
 	..\core\srs_core_source.hpp,
 	..\core\srs_core_source.cpp,
 	..\core\srs_core_forward.hpp,