From a0c0c94cf0bb8af9674d61754ab202930ca3b342 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 21 Mar 2014 14:00:26 +0800 Subject: [PATCH] refine conf, add comments for other listen type --- trunk/conf/demo.19350.conf | 1 - trunk/conf/full.conf | 0 trunk/conf/srs.conf | 0 trunk/src/app/srs_app_config.cpp | 1 + trunk/src/app/srs_app_server.cpp | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 trunk/conf/full.conf mode change 100755 => 100644 trunk/conf/srs.conf diff --git a/trunk/conf/demo.19350.conf b/trunk/conf/demo.19350.conf index 9a898fbef..91c0b1d87 100644 --- a/trunk/conf/demo.19350.conf +++ b/trunk/conf/demo.19350.conf @@ -3,7 +3,6 @@ # @see full.conf for detail config. listen 19350; -chunk_size 65000; vhost __defaultVhost__ { enabled on; gop_cache on; diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf old mode 100755 new mode 100644 diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf old mode 100755 new mode 100644 diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 93a5e619f..dfb0f173c 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -670,6 +670,7 @@ int SrsConfig::parse_file(const char* filename) } SrsConfDirective* conf = NULL; + // check rtmp port specified by directive listen. if ((conf = get_listen()) == NULL || conf->args.size() == 0) { ret = ERROR_SYSTEM_CONFIG_INVALID; srs_error("line %d: conf error, " diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index 5ae8640c0..bc24ac4ca 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -325,7 +325,7 @@ int SrsServer::accept_client(SrsListenerType type, st_netfd_t client_stfd) if (type == SrsListenerStream) { conn = new SrsClient(this, client_stfd); } else { - // handler others + // TODO: FIXME: handler others } srs_assert(conn);