add --with-http-api option

winlin
Commit 1922d62ff7dad75cf607c83d13e9bf433e22415a 1922d62f 1 parent 52263457
trunk/auto/depends.sh
trunk/auto/options.sh
trunk/configure
trunk/src/app/srs_app_http_api.cpp
trunk/src/app/srs_app_http_api.hpp
trunk/src/app/srs_app_server.cpp
--- a/trunk/auto/depends.sh
查看文件 @1922d62
+++ b/trunk/auto/depends.sh
查看文件 @1922d62
@@ -274,6 +274,12 @@ else
     echo "#undef SRS_HTTP_SERVER" >> $SRS_AUTO_HEADERS_H
 fi
+if [ $SRS_HTTP_API = YES ]; then
+    echo "#define SRS_HTTP_API" >> $SRS_AUTO_HEADERS_H
+else
+    echo "#undef SRS_HTTP_API" >> $SRS_AUTO_HEADERS_H
+fi
+
 #####################################################################################
 # nginx for HLS, nginx-1.5.0
 #####################################################################################
--- a/trunk/auto/options.sh
查看文件 @1922d62
+++ b/trunk/auto/options.sh
查看文件 @1922d62
@@ -20,6 +20,7 @@ SRS_FFMPEG=RESERVED
 SRS_HTTP_PARSER=RESERVED
 SRS_HTTP_CALLBACK=RESERVED
 SRS_HTTP_SERVER=RESERVED
+SRS_HTTP_API=RESERVED
 SRS_LIBRTMP=RESERVED # srs-librtmp
 SRS_BWTC=RESERVED # srs-bandwidth-test client
 SRS_RESEARCH=RESERVED
@@ -67,6 +68,7 @@ do
         --with-ffmpeg)                  SRS_FFMPEG=YES              ;;
         --with-http-callback)           SRS_HTTP_CALLBACK=YES       ;;
         --with-http-server)             SRS_HTTP_SERVER=YES         ;;
+        --with-http-api)                SRS_HTTP_API=YES            ;;
         --with-librtmp)                 SRS_LIBRTMP=YES             ;;
         --with-bwtc)                    SRS_BWTC=YES                ;;
         --with-research)                SRS_RESEARCH=YES            ;;
@@ -84,6 +86,7 @@ do
         --without-ffmpeg)               SRS_FFMPEG=NO               ;;
         --without-http-callback)        SRS_HTTP_CALLBACK=NO        ;;
         --without-http-server)          SRS_HTTP_SERVER=NO          ;;
+        --without-http-api)             SRS_HTTP_API=NO             ;;
         --without-librtmp)              SRS_LIBRTMP=NO              ;;
         --without-bwtc)                 SRS_BWTC=NO                 ;;
         --without-research)             SRS_RESEARCH=NO             ;;
@@ -119,6 +122,7 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then
     if [ $SRS_FFMPEG = RESERVED ]; then SRS_FFMPEG=NO; fi
     if [ $SRS_HTTP_CALLBACK = RESERVED ]; then SRS_HTTP_CALLBACK=NO; fi
     if [ $SRS_HTTP_SERVER = RESERVED ]; then SRS_HTTP_SERVER=NO; fi
+    if [ $SRS_HTTP_API = RESERVED ]; then SRS_HTTP_API=NO; fi
     if [ $SRS_LIBRTMP = RESERVED ]; then SRS_LIBRTMP=NO; fi
     if [ $SRS_BWTC = RESERVED ]; then SRS_BWTC=NO; fi
     if [ $SRS_RESEARCH = RESERVED ]; then SRS_RESEARCH=NO; fi
@@ -140,6 +144,7 @@ else
     if [ $SRS_FFMPEG = RESERVED ]; then SRS_FFMPEG=NO; fi
     if [ $SRS_HTTP_CALLBACK = RESERVED ]; then SRS_HTTP_CALLBACK=NO; fi
     if [ $SRS_HTTP_SERVER = RESERVED ]; then SRS_HTTP_SERVER=NO; fi
+    if [ $SRS_HTTP_API = RESERVED ]; then SRS_HTTP_API=NO; fi
     if [ $SRS_LIBRTMP = RESERVED ]; then SRS_LIBRTMP=NO; fi
     if [ $SRS_BWTC = RESERVED ]; then SRS_BWTC=NO; fi
     if [ $SRS_RESEARCH = RESERVED ]; then SRS_RESEARCH=NO; fi
@@ -163,6 +168,7 @@ if [ $SRS_DEV = YES ]; then
     SRS_FFMPEG=YES
     SRS_HTTP_CALLBACK=YES
     SRS_HTTP_SERVER=YES
+    SRS_HTTP_API=YES
     SRS_LIBRTMP=YES
     SRS_BWTC=YES
     SRS_RESEARCH=YES
@@ -185,6 +191,7 @@ if [ $SRS_PI = YES ]; then
     SRS_FFMPEG=NO
     SRS_HTTP_CALLBACK=NO
     SRS_HTTP_SERVER=YES
+    SRS_HTTP_API=YES
     SRS_LIBRTMP=NO
     SRS_BWTC=NO
     SRS_RESEARCH=NO
@@ -202,6 +209,7 @@ fi
 # if http-xxxx specified, open the SRS_HTTP_PARSER
 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
 # parse the jobs for make
 if [[ "" -eq SRS_JOBS ]]; then 
@@ -226,31 +234,33 @@ if [ $help = yes ]; then
   --with-hls                enable hls streaming, build nginx as http server for hls.
   --with-http-callback      enable http hooks, build cherrypy as demo api server.
   --with-http-server        enable http server to delivery http stream.
+  --with-http-api           enable http api, to manage SRS by http api.
   --with-ffmpeg             enable transcoding with ffmpeg.
   --with-librtmp            enable srs-librtmp, library for client.
-  --with-bwtc              enable srs bandwidth test client tool.
+  --with-bwtc               enable SRS bandwidth test client tool.
   --with-research           build the research tools.
-  --with-utest             build the utest for srs.
-  --with-gperf             build srs with gperf tools(no gmc/gmp/gcp, with tcmalloc only).
-  --with-gmc               build memory check for srs with gperf tools.
-  --with-gmp               build memory profile for srs with gperf tools.
-  --with-gcp               build cpu profile for srs with gperf tools.
-  --with-gprof             build srs with gprof(GNU profile tool).
-  --with-arm-ubuntu12      build srs on ubuntu12 for armhf(v7cpu).
+  --with-utest              build the utest for SRS.
+  --with-gperf              build SRS with gperf tools(no gmc/gmp/gcp, with tcmalloc only).
+  --with-gmc                build memory check for SRS with gperf tools.
+  --with-gmp                build memory profile for SRS with gperf tools.
+  --with-gcp                build cpu profile for SRS with gperf tools.
+  --with-gprof              build SRS with gprof(GNU profile tool).
+  --with-arm-ubuntu12       build SRS on ubuntu12 for armhf(v7cpu).
   --without-ssl             disable rtmp complex handshake.
   --without-hls             disable hls, rtmp streaming only.
   --without-http-callback   disable http, http hooks callback.
   --without-http-server     disable http server, use external server to delivery http stream.
+  --without-http-api        disable http api, only use console to manage SRS process.
   --without-ffmpeg          disable the ffmpeg transcoding feature.
   --without-librtmp         disable srs-librtmp, library for client.
-  --without-bwtc           disable srs bandwidth test client tool.
+  --without-bwtc            disable SRS bandwidth test client tool.
   --without-research        do not build the research tools.
-  --without-utest          do not build the utest for srs.
-  --without-gperf          do not build srs with gperf tools(without tcmalloc and gmc/gmp/gcp).
-  --without-gmc            do not build memory check for srs with gperf tools.
-  --without-gmp            do not build memory profile for srs with gperf tools.
-  --without-gcp            do not build cpu profile for srs with gperf tools.
+  --without-utest           do not build the utest for SRS.
+  --without-gperf           do not build SRS with gperf tools(without tcmalloc and gmc/gmp/gcp).
+  --without-gmc             do not build memory check for SRS with gperf tools.
+  --without-gmp             do not build memory profile for SRS with gperf tools.
+  --without-gcp             do not build cpu profile for SRS with gperf tools.
   --without-gprof           do not build srs with gprof(GNU profile tool).
   --without-arm-ubuntu12    do not build srs on ubuntu12 for armhf(v7cpu).
@@ -313,6 +323,7 @@ if [ $SRS_SSL = RESERVED ]; then echo "you must specifies the ssl, see: ./config
 if [ $SRS_FFMPEG = RESERVED ]; then echo "you must specifies the ffmpeg, see: ./configure --help"; __check_ok=NO; fi
 if [ $SRS_HTTP_CALLBACK = RESERVED ]; then echo "you must specifies the http-callback, see: ./configure --help"; __check_ok=NO; fi
 if [ $SRS_HTTP_SERVER = RESERVED ]; then echo "you must specifies the http-server, see: ./configure --help"; __check_ok=NO; fi
+if [ $SRS_HTTP_API = RESERVED ]; then echo "you must specifies the http-api, see: ./configure --help"; __check_ok=NO; fi
 if [ $SRS_LIBRTMP = RESERVED ]; then echo "you must specifies the librtmp, see: ./configure --help"; __check_ok=NO; fi
 if [ $SRS_BWTC = RESERVED ]; then echo "you must specifies the bwtc, see: ./configure --help"; __check_ok=NO; fi
 if [ $SRS_RESEARCH = RESERVED ]; then echo "you must specifies the research, see: ./configure --help"; __check_ok=NO; fi
@@ -338,6 +349,7 @@ if [ $SRS_SSL = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-ssl"; else SR
 if [ $SRS_FFMPEG = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-ffmpeg"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-ffmpeg"; fi
 if [ $SRS_HTTP_CALLBACK = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-http-callback"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-http-callback"; fi
 if [ $SRS_HTTP_SERVER = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-http-server"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-http-server"; fi
+if [ $SRS_HTTP_API = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-http-api"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-http-api"; fi
 if [ $SRS_LIBRTMP = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-librtmp"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-librtmp"; fi
 if [ $SRS_BWTC = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-bwtc"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-bwtc"; fi
 if [ $SRS_RESEARCH = YES ]; then SRS_CONFIGURE="${SRS_CONFIGURE} --with-research"; else SRS_CONFIGURE="${SRS_CONFIGURE} --without-research"; fi
--- a/trunk/configure
查看文件 @1922d62
+++ b/trunk/configure
查看文件 @1922d62
@@ -87,6 +87,7 @@ SrsSslSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_SSL = YES ]; then SrsSslSu
 SrsFfmpegSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_FFMPEG = YES ]; then SrsFfmpegSummaryColor="\${GREEN}"; fi
 SrsHttpCallbackSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_CALLBACK = YES ]; then SrsHttpCallbackSummaryColor="\${GREEN}"; fi
 SrsHttpServerSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_SERVER = YES ]; then SrsHttpServerSummaryColor="\${GREEN}"; fi
+SrsHttpApiSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_API = YES ]; then SrsHttpApiSummaryColor="\${GREEN}"; fi
 SrsLibrtmpSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_LIBRTMP = YES ]; then SrsLibrtmpSummaryColor="\${GREEN}"; fi
 SrsLibrtmpSSLSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_LIBRTMP = YES ]; then if [ $SRS_SSL = YES ]; then SrsLibrtmpSSLSummaryColor="\${GREEN}"; fi fi
 SrsBWTCSummaryColor="\${GREEN}{disabled} "; if [ $SRS_BWTC = YES ]; then SrsBWTCSummaryColor="\${GREEN}"; fi
@@ -156,6 +157,8 @@ echo -e "     |     ${SrsHttpCallbackSummaryColor}http-callback @see: https://gi
 echo -e "     |     ${SrsHttpCallbackSummaryColor}http-callback: support http callback for authentication and event injection\${BLACK}"
 echo -e "     |     ${SrsHttpServerSummaryColor}http-server @see: https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPServer\${BLACK}"
 echo -e "     |     ${SrsHttpServerSummaryColor}http-server: support http server to delivery http stream\${BLACK}"
+echo -e "     |     ${SrsHttpApiSummaryColor}http-api @see: https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPApi\${BLACK}"
+echo -e "     |     ${SrsHttpApiSummaryColor}http-api: support http api to manage server\${BLACK}"
 echo -e "     \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
 echo -e "\${GREEN}binaries @see: https://github.com/winlinvip/simple-rtmp-server/wiki/Build\${BLACK}"
 END
@@ -527,6 +530,11 @@ if [ $SRS_HTTP_SERVER = YES ]; then
 else
     echo -e "${YELLOW}warning: without http server to delivery http stream support${BLACK}"
 fi
+if [ $SRS_HTTP_API = YES ]; then
+    echo -e "${GREEN}http api to manage server is enabled${BLACK}"
+else
+    echo -e "${YELLOW}warning: without http api to manage server support${BLACK}"
+fi
 if [ $SRS_LIBRTMP = YES ]; then
     echo -e "${GREEN}srs-librtmp for client is enabled${BLACK}"
 else
--- a/trunk/src/app/srs_app_http_api.cpp
查看文件 @1922d62
+++ b/trunk/src/app/srs_app_http_api.cpp
查看文件 @1922d62
@@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_app_http_api.hpp>
+#ifdef SRS_HTTP_API
+
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
@@ -47,3 +49,5 @@ int SrsHttpApi::do_cycle()
     return ret;
 }
+
+#endif
--- a/trunk/src/app/srs_app_http_api.hpp
查看文件 @1922d62
+++ b/trunk/src/app/srs_app_http_api.hpp
查看文件 @1922d62
@@ -30,6 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_core.hpp>
+#ifdef SRS_HTTP_API
+
 #include <srs_app_st.hpp>
 #include <srs_app_conn.hpp>
@@ -43,3 +45,5 @@ protected:
 };
 #endif
+
+#endif
--- a/trunk/src/app/srs_app_server.cpp
查看文件 @1922d62
+++ b/trunk/src/app/srs_app_server.cpp
查看文件 @1922d62
@@ -438,7 +438,13 @@ int SrsServer::accept_client(SrsListenerType type, st_netfd_t client_stfd)
     if (type == SrsListenerRtmpStream) {
         conn = new SrsRtmpConn(this, client_stfd);
     } else if (type == SrsListenerHttpApi) {
+#ifdef SRS_HTTP_API
         conn = new SrsHttpApi(this, client_stfd);
+#else
+        srs_warn("close http client for server not support http-api");
+        srs_close_stfd(client_stfd);
+        return ret;
+#endif
     } else if (type == SrsListenerHttpStream) {
 #ifdef SRS_HTTP_SERVER
         conn = new SrsHttpConn(this, client_stfd);