Merge #1045, for #1044, TCP connection alive detection. 2.0.245

Author: winlinvip

README.md

@@ -332,6 +332,7 @@ Remark:
 
 ## History
 
+* v2.0, 2018-01-07, Merge [#1045][bug #1045], fix [#1044][bug #1044], TCP connection alive detection. 2.0.245
 * v2.0, 2018-01-04, Merge [#1039][bug #1039], fix bug of init.d script.
 * v2.0, 2018-01-01, Merge [#1033][bug #1033], allow user to add some specific flags. 2.0.244
 * <strong>v2.0, 2017-06-10, [2.0 release2(2.0.243)][r2.0r2] released. 86670 lines.</strong>
@@ -1300,6 +1301,8 @@ Winlin
 [bug #899]: https://github.com/ossrs/srs/issues/899
 [bug #1033]: https://github.com/ossrs/srs/issues/1033
 [bug #1039]: https://github.com/ossrs/srs/issues/1039
+[bug #1044]: https://github.com/ossrs/srs/issues/1044
+[bug #1045]: https://github.com/ossrs/srs/issues/1045
 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
 
 [exo #828]: https://github.com/google/ExoPlayer/pull/828

trunk/src/app/srs_app_listener.cpp

@@ -223,7 +223,7 @@ int SrsTcpListener::listen()
     }
     srs_verbose("setsockopt reuse-addr success. port=%d, fd=%d", port, _fd);
 
-#ifdef SO_KEEPALIVE
+#ifdef SRS_PERF_SO_KEEPALIVE
     int tcp_keepalive = 1;
     if (setsockopt(_fd, SOL_SOCKET, SO_KEEPALIVE, &tcp_keepalive, sizeof(int)) == -1) {
         ret = ERROR_SOCKET_SETKEEPALIVE;

trunk/src/core/srs_core.hpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR       2
 #define VERSION_MINOR       0
-#define VERSION_REVISION    244
+#define VERSION_REVISION    245
 
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>

trunk/src/core/srs_core_performance.hpp

@@ -188,5 +188,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #undef SRS_PERF_FAST_FLV_ENCODER
 #define SRS_PERF_FAST_FLV_ENCODER
 
+// Whether set SO_KEEPALIVE for TCP connection.
+// @see https://github.com/ossrs/srs/issues/1044
+#undef SRS_PERF_SO_KEEPALIVE
+
 #endif