github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug of configure.

Browse Source
pull/444/head
winlin 10 years ago
parent eb488e3bde
commit fec8422d6b
16 changed files with 70 additions and 67 deletions
Show Stats Download Patch File Download Diff File

6
trunk/auto/auto_headers.sh
Unescape Escape View File

@ -76,10 +76,10 @@ fi
echo "" >> $SRS_AUTO_HEADERS_H
# auto headers in depends.
if [ $SRS_HTTP_PARSER = YES ]; then
echo "#define SRS_AUTO_HTTP_PARSER" >> $SRS_AUTO_HEADERS_H
if [ $SRS_HTTP_CORE = YES ]; then
echo "#define SRS_AUTO_HTTP_CORE" >> $SRS_AUTO_HEADERS_H
else
echo "#undef SRS_AUTO_HTTP_PARSER" >> $SRS_AUTO_HEADERS_H
echo "#undef SRS_AUTO_HTTP_CORE" >> $SRS_AUTO_HEADERS_H
fi
if [ $SRS_HTTP_SERVER = YES ]; then

2
trunk/auto/depends.sh
Unescape Escape View File

@ -426,7 +426,7 @@ fi
# http-parser-2.1
#####################################################################################
# check the arm flag file, if flag changed, need to rebuild the st.
if [ $SRS_HTTP_PARSER = YES ]; then
if [ $SRS_HTTP_CORE = YES ]; then
# ok, arm specified, if the flag filed does not exists, need to rebuild.
if [ $SRS_EMBEDED_CPU = YES ]; then
if [[ -f ${SRS_OBJS}/_flag.st.hp.tmp && -f ${SRS_OBJS}/hp/http_parser.h && -f ${SRS_OBJS}/hp/libhttp_parser.a ]]; then

51
trunk/auto/options.sh
Unescape Escape View File

@ -45,7 +45,7 @@ SRS_GPROF=RESERVED
################################################################
# libraries
SRS_FFMPEG_STUB=RESERVED
SRS_HTTP_PARSER=RESERVED
SRS_HTTP_CORE=RESERVED
# arguments
SRS_PREFIX=/usr/local/srs
SRS_JOBS=1
@ -376,7 +376,7 @@ function apply_user_presets() {
SRS_TRANSCODE=NO
SRS_INGEST=NO
SRS_STAT=NO
SRS_HTTP_PARSER=NO
SRS_HTTP_CORE=NO
SRS_HTTP_CALLBACK=NO
SRS_HTTP_SERVER=NO
SRS_STREAM_CASTER=NO
@ -403,7 +403,7 @@ function apply_user_presets() {
SRS_TRANSCODE=YES
SRS_INGEST=YES
SRS_STAT=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CORE=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_STREAM_CASTER=YES
@ -430,7 +430,7 @@ function apply_user_presets() {
SRS_TRANSCODE=NO
SRS_INGEST=NO
SRS_STAT=NO
SRS_HTTP_PARSER=NO
SRS_HTTP_CORE=NO
SRS_HTTP_CALLBACK=NO
SRS_HTTP_SERVER=NO
SRS_STREAM_CASTER=NO
@ -457,7 +457,7 @@ function apply_user_presets() {
SRS_TRANSCODE=NO
SRS_INGEST=NO
SRS_STAT=NO
SRS_HTTP_PARSER=NO
SRS_HTTP_CORE=NO
SRS_HTTP_CALLBACK=NO
SRS_HTTP_SERVER=NO
SRS_STREAM_CASTER=NO
@ -484,7 +484,7 @@ function apply_user_presets() {
SRS_TRANSCODE=NO
SRS_INGEST=NO
SRS_STAT=NO
SRS_HTTP_PARSER=NO
SRS_HTTP_CORE=NO
SRS_HTTP_CALLBACK=NO
SRS_HTTP_SERVER=NO
SRS_STREAM_CASTER=NO
@ -511,7 +511,7 @@ function apply_user_presets() {
SRS_TRANSCODE=YES
SRS_INGEST=YES
SRS_STAT=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CORE=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_STREAM_CASTER=NO
@ -539,7 +539,7 @@ function apply_user_presets() {
SRS_TRANSCODE=YES
SRS_INGEST=YES
SRS_STAT=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CORE=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_STREAM_CASTER=NO
@ -566,7 +566,7 @@ function apply_user_presets() {
SRS_TRANSCODE=YES
SRS_INGEST=YES
SRS_STAT=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CORE=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_STREAM_CASTER=NO
@ -593,7 +593,7 @@ function apply_user_presets() {
SRS_TRANSCODE=YES
SRS_INGEST=YES
SRS_STAT=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CORE=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_STREAM_CASTER=NO
@ -620,7 +620,7 @@ function apply_user_presets() {
SRS_TRANSCODE=YES
SRS_INGEST=YES
SRS_STAT=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CORE=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_STREAM_CASTER=NO
@ -647,7 +647,7 @@ function apply_user_presets() {
SRS_TRANSCODE=YES
SRS_INGEST=YES
SRS_STAT=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CORE=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_STREAM_CASTER=NO
@ -674,7 +674,7 @@ function apply_user_presets() {
SRS_TRANSCODE=YES
SRS_INGEST=YES
SRS_STAT=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CORE=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_STREAM_CASTER=NO
@ -701,7 +701,7 @@ function apply_user_presets() {
SRS_TRANSCODE=YES
SRS_INGEST=YES
SRS_STAT=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CORE=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_STREAM_CASTER=NO
@ -728,7 +728,7 @@ function apply_user_presets() {
SRS_TRANSCODE=YES
SRS_INGEST=YES
SRS_STAT=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CORE=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_STREAM_CASTER=NO
@ -761,11 +761,11 @@ function apply_user_detail_options() {
if [ $SRS_TRANSCODE = YES ]; then SRS_FFMPEG_STUB=YES; fi
if [ $SRS_INGEST = YES ]; then SRS_FFMPEG_STUB=YES; fi
# if http-xxxx specified, open the SRS_HTTP_PARSER
SRS_HTTP_PARSER=NO
if [ $SRS_HTTP_CALLBACK = YES ]; then SRS_HTTP_PARSER=YES; fi
if [ $SRS_HTTP_SERVER = YES ]; then SRS_HTTP_PARSER=YES; fi
if [ $SRS_HTTP_API = YES ]; then SRS_HTTP_PARSER=YES; fi
# if http-xxxx specified, open the SRS_HTTP_CORE
SRS_HTTP_CORE=NO
if [ $SRS_HTTP_CALLBACK = YES ]; then SRS_HTTP_CORE=YES; fi
if [ $SRS_HTTP_SERVER = YES ]; then SRS_HTTP_CORE=YES; fi
if [ $SRS_HTTP_API = YES ]; then SRS_HTTP_CORE=YES; fi
# parse the jobs for make
if [[ "" -eq SRS_JOBS ]]; then
@ -790,7 +790,7 @@ function apply_user_detail_options() {
SRS_TRANSCODE=NO
SRS_INGEST=NO
SRS_STAT=NO
SRS_HTTP_PARSER=NO
SRS_HTTP_CORE=NO
SRS_HTTP_CALLBACK=NO
SRS_HTTP_SERVER=NO
SRS_STREAM_CASTER=NO
@ -855,13 +855,14 @@ function check_option_conflicts() {
if [ $SRS_GPERF_MP = YES ]; then echo "gperf-mp depends on gperf, see: ./configure --help"; __check_ok=NO; fi
if [ $SRS_GPERF_CP = YES ]; then echo "gperf-cp depends on gperf, see: ./configure --help"; __check_ok=NO; fi
fi
if [ $SRS_GPERF_MC = YES ]; then
if [ $SRS_GPERF_MP = YES ]; then
if [[ $SRS_GPERF_MC = YES && $SRS_GPERF_MP = YES ]]; then
echo "gperf-mc not compatible with gperf-mp, see: ./configure --help";
echo "@see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html";
echo "Note that since the heap-checker uses the heap-profiling framework internally, it is not possible to run both the heap-checker and heap profiler at the same time";
__check_ok=NO
fi
if [[ $SRS_HTTP_CORE = NO && $SRS_STREAM_CASTER = YES ]]; then
echo "stream-caster depends on http-api or http-server, see: ./configure --help"; __check_ok=NO;
fi
# generate the group option: SRS_GPERF
__gperf_slow=NO
@ -885,11 +886,9 @@ function check_option_conflicts() {
fi
# if x86/x64 or directly build, never use static
if [ $SRS_X86_X64 = YES ]; then
if [ $SRS_STATIC = YES ]; then
if [[ $SRS_X86_X64 = YES && $SRS_STATIC = YES ]]; then
echo "x86/x64 should never use static, see: ./configure --help"; __check_ok=NO;
fi
fi
# TODO: FIXME: check more os.

2
trunk/configure vendored
Unescape Escape View File

@ -115,7 +115,7 @@ END
LibSTRoot="${SRS_OBJS_DIR}/st"; LibSTfile="${LibSTRoot}/libst.a"
# hp(http-parser) the http request/url parser, for SRS to support HTTP callback.
LibHttpParserRoot=""; LibHttpParserfile=""
if [ $SRS_HTTP_PARSER = YES ]; then LibHttpParserRoot="${SRS_OBJS_DIR}/hp"; LibHttpParserfile="${LibHttpParserRoot}/libhttp_parser.a"; fi
if [ $SRS_HTTP_CORE = YES ]; then LibHttpParserRoot="${SRS_OBJS_DIR}/hp"; LibHttpParserfile="${LibHttpParserRoot}/libhttp_parser.a"; fi
# openssl-1.0.1f, for the RTMP complex handshake.
LibSSLRoot="";LibSSLfile=""
if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = NO ]; then LibSSLRoot="${SRS_OBJS_DIR}/openssl/include"; LibSSLfile="${SRS_OBJS_DIR}/openssl/lib/libssl.a ${SRS_OBJS_DIR}/openssl/lib/libcrypto.a"; fi fi

12
trunk/src/app/srs_app_caster_flv.cpp
Unescape Escape View File

@ -33,7 +33,6 @@ using namespace std;
#include <srs_kernel_log.hpp>
#include <srs_app_config.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_app_http.hpp>
#include <srs_app_http_conn.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_flv.hpp>
@ -89,9 +88,10 @@ void SrsAppCasterFlv::remove(SrsConnection* c)
}
}
int SrsAppCasterFlv::serve_http(ISrsHttpResponseWriter* w, SrsHttpMessage* r)
int SrsAppCasterFlv::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
{
SrsDynamicHttpConn* conn = dynamic_cast<SrsDynamicHttpConn*>(r->connection());
SrsHttpMessage* msg = dynamic_cast<SrsHttpMessage*>(r);
SrsDynamicHttpConn* conn = dynamic_cast<SrsDynamicHttpConn*>(msg->connection());
srs_assert(conn);
std::string app = srs_path_dirname(r->path());
@ -134,13 +134,13 @@ SrsDynamicHttpConn::~SrsDynamicHttpConn()
srs_freep(pprint);
}
int SrsDynamicHttpConn::on_got_http_message(SrsHttpMessage* msg)
int SrsDynamicHttpConn::on_got_http_message(ISrsHttpMessage* msg)
{
int ret = ERROR_SUCCESS;
return ret;
}
int SrsDynamicHttpConn::proxy(ISrsHttpResponseWriter* w, SrsHttpMessage* r, std::string o)
int SrsDynamicHttpConn::proxy(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string o)
{
int ret = ERROR_SUCCESS;
@ -430,7 +430,7 @@ int SrsHttpFileReader::read(void* buf, size_t count, ssize_t* pnread)
}
int total_read = 0;
while (total_read < count) {
while (total_read < (int)count) {
int nread = 0;
if ((ret = http->read((char*)buf + total_read, (int)(count - total_read), &nread)) != ERROR_SUCCESS) {
return ret;

8
trunk/src/app/srs_app_caster_flv.hpp
Unescape Escape View File

@ -37,7 +37,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class SrsConfDirective;
class SrsHttpServeMux;
class SrsHttpConn;
class SrsRtmpClient;
class SrsStSocket;
class SrsRequest;
@ -48,7 +47,6 @@ class SrsFlvDecoder;
#include <srs_app_st.hpp>
#include <srs_app_listener.hpp>
#include <srs_app_conn.hpp>
#include <srs_app_http.hpp>
#include <srs_app_http_conn.hpp>
#include <srs_kernel_file.hpp>
@ -75,7 +73,7 @@ public:
virtual void remove(SrsConnection* c);
// ISrsHttpHandler
public:
virtual int serve_http(ISrsHttpResponseWriter* w, SrsHttpMessage* r);
virtual int serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
};
/**
@ -96,9 +94,9 @@ public:
SrsDynamicHttpConn(IConnectionManager* cm, st_netfd_t fd, SrsHttpServeMux* m);
virtual ~SrsDynamicHttpConn();
public:
virtual int on_got_http_message(SrsHttpMessage* msg);
virtual int on_got_http_message(ISrsHttpMessage* msg);
public:
virtual int proxy(ISrsHttpResponseWriter* w, SrsHttpMessage* r, std::string o);
virtual int proxy(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string o);
private:
virtual int do_proxy(ISrsHttpResponseReader* rr, SrsFlvDecoder* dec);
virtual int rtmp_write_packet(char type, u_int32_t timestamp, char* data, int size);

2
trunk/src/app/srs_app_heartbeat.cpp
Unescape Escape View File

@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_heartbeat.hpp>
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
#include <sstream>
using namespace std;

2
trunk/src/app/srs_app_heartbeat.hpp
Unescape Escape View File

@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_core.hpp>
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
/**
* the http heartbeat to api-server to notice api

2
trunk/src/app/srs_app_http_client.cpp
Unescape Escape View File

@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_http_client.hpp>
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
#include <arpa/inet.h>

2
trunk/src/app/srs_app_http_client.hpp
Unescape Escape View File

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string>
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
#include <srs_app_st.hpp>

7
trunk/src/app/srs_app_http_conn.cpp
Unescape Escape View File

@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_http_conn.hpp>
#if defined(SRS_AUTO_HTTP_PARSER) || defined(SRS_AUTO_HTTP_SERVER)
#if defined(SRS_AUTO_HTTP_CORE) || defined(SRS_AUTO_HTTP_SERVER)
#include <sys/types.h>
#include <sys/stat.h>
@ -55,7 +55,7 @@ using namespace std;
#endif
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
SrsHttpResponseWriter::SrsHttpResponseWriter(SrsStSocket* io)
{
@ -2423,6 +2423,9 @@ int SrsHttpServer::initialize_hls_streaming()
return ret;
}
#endif
#ifdef SRS_AUTO_HTTP_CORE
SrsHttpConn::SrsHttpConn(IConnectionManager* cm, st_netfd_t fd, SrsHttpServeMux* m)
: SrsConnection(cm, fd)
{

11
trunk/src/app/srs_app_http_conn.hpp
Unescape Escape View File

@ -30,11 +30,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp>
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
#include <http_parser.h>
#endif
#if defined(SRS_AUTO_HTTP_PARSER) || defined(SRS_AUTO_HTTP_SERVER)
#ifdef SRS_AUTO_HTTP_CORE
#include <map>
#include <string>
@ -69,7 +69,7 @@ class SrsHttpMessage;
#endif
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
// the http chunked header size,
// for writev, there always one chunk to send it.
@ -214,7 +214,7 @@ public:
virtual int update(std::string url, http_parser* header,
SrsFastBuffer* body, std::vector<SrsHttpHeaderField>& headers
);
private:
public:
virtual SrsConnection* connection();
public:
virtual u_int8_t method();
@ -711,6 +711,9 @@ private:
virtual int initialize_hls_streaming();
};
#endif
#ifdef SRS_AUTO_HTTP_CORE
class SrsHttpConn : public SrsConnection
{
private:

8
trunk/src/app/srs_app_server.cpp
Unescape Escape View File

@ -495,7 +495,7 @@ SrsServer::SrsServer()
#ifdef SRS_AUTO_HTTP_SERVER
http_stream_mux = new SrsHttpServer(this);
#endif
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
http_heartbeat = NULL;
#endif
#ifdef SRS_AUTO_INGEST
@ -530,7 +530,7 @@ void SrsServer::destroy()
srs_freep(http_stream_mux);
#endif
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
srs_freep(http_heartbeat);
#endif
@ -589,7 +589,7 @@ int SrsServer::initialize(ISrsServerCycle* cycle_handler)
}
#endif
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
srs_assert(!http_heartbeat);
http_heartbeat = new SrsHttpHeartbeat();
#endif
@ -971,7 +971,7 @@ int SrsServer::do_cycle()
srs_info("update network server kbps info.");
resample_kbps();
}
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
if (_srs_config->get_heartbeat_enabled()) {
if ((i % heartbeat_max_resolution) == 0) {
srs_info("do http heartbeat, for internal server to report.");

2
trunk/src/app/srs_app_server.hpp
Unescape Escape View File

@ -240,7 +240,7 @@ private:
#ifdef SRS_AUTO_HTTP_SERVER
SrsHttpServer* http_stream_mux;
#endif
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
SrsHttpHeartbeat* http_heartbeat;
#endif
#ifdef SRS_AUTO_INGEST

6
trunk/src/main/srs_main_ingest_hls.cpp
Unescape Escape View File

@ -61,7 +61,7 @@ ISrsThreadContext* _srs_context = new ISrsThreadContext();
SrsConfig* _srs_config = NULL;
SrsServer* _srs_server = NULL;
#if defined(SRS_AUTO_HTTP_PARSER)
#if defined(SRS_AUTO_HTTP_CORE)
/**
* main entrance.
@ -72,7 +72,7 @@ int main(int argc, char** argv)
srs_assert(srs_is_little_endian());
// directly failed when compile limited.
#if !defined(SRS_AUTO_HTTP_PARSER)
#if !defined(SRS_AUTO_HTTP_CORE)
srs_error("depends on http-parser.");
exit(-1);
#endif
@ -1408,7 +1408,7 @@ int proxy_hls2rtmp(string hls, string rtmp)
int main(int argc, char** argv)
{
#ifndef SRS_AUTO_HTTP_PARSER
#ifndef SRS_AUTO_HTTP_CORE
srs_error("ingest requires http-api or http-server");
#endif
return -1;

2
trunk/src/main/srs_main_server.cpp
Unescape Escape View File

@ -96,7 +96,7 @@ void show_macro_features()
srs_warn("check feature http server: off");
#endif
#ifdef SRS_AUTO_HTTP_PARSER
#ifdef SRS_AUTO_HTTP_CORE
srs_trace("check feature http parser: on");
#else
srs_warn("check feature http parser: off");

Write Preview
Loading…
Cancel
Save