For #1045, revert macro for TCP keepalive detection, use system macro

ossrs · Jan 7, 2018 · 366309c · 366309c
1 parent 911cd44
commit 366309c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/trunk/src/app/srs_app_listener.cpp b/trunk/src/app/srs_app_listener.cpp
@@ -223,7 +223,9 @@ int SrsTcpListener::listen()
     }
     srs_verbose("setsockopt reuse-addr success. port=%d, fd=%d", port, _fd);
 
-#ifdef SRS_PERF_SO_KEEPALIVE
+    // Detect alive for TCP connection.
+    // @see https://github.com/ossrs/srs/issues/1044
+#ifdef SO_KEEPALIVE
     int tcp_keepalive = 1;
     if (setsockopt(_fd, SOL_SOCKET, SO_KEEPALIVE, &tcp_keepalive, sizeof(int)) == -1) {
         ret = ERROR_SOCKET_SETKEEPALIVE;

diff --git a/trunk/src/core/srs_core_performance.hpp b/trunk/src/core/srs_core_performance.hpp
@@ -188,9 +188,5 @@ 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