From ba5b3b92b18b2d3adb89958530bd113e706b77d1 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 16 Nov 2014 21:08:06 +0800 Subject: [PATCH 1/3] update readme, add qq group. --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 263ecd452..4b59f8916 100755 --- a/README.md +++ b/README.md @@ -140,9 +140,7 @@ h.264 raw stream( WebSite: [http://ossrs.net](http://ossrs.net)
Release: [http://winlinvip.github.io/srs.release](http://winlinvip.github.io/srs.release)
Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin)
-CSDN mirror: [https://code.csdn.net/winlinvip/srs-csdn](https://code.csdn.net/winlinvip/srs-csdn)
-See also: [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server)
-Github DEMO: [demo with your SRS](http://winlinvip.github.io/srs.release/trunk/research/players/srs_player.html?server=192.168.1.170&vhost=192.168.1.170)
+QQ Group: [365936885, by wenjie](http://jq.qq.com/?_wv=1027&k=SvTiJl)
Wiki: [https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki)
StreamServers：[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https://github.com/wenjiegit/Bull-Live-Encoder), [NGINX-RTMP](https://github.com/arut/nginx-rtmp-module), [CRTMPD](http://www.rtmpd.com/), From 520764fba33bd501d290c178d49a12bc28be415a Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 16 Nov 2014 21:11:49 +0800 Subject: [PATCH 2/3] update readme, add qq group. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b59f8916..4d3cc4c7a 100755 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ h.264 raw stream( WebSite: [http://ossrs.net](http://ossrs.net)
Release: [http://winlinvip.github.io/srs.release](http://winlinvip.github.io/srs.release)
Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin)
-QQ Group: [365936885, by wenjie](http://jq.qq.com/?_wv=1027&k=SvTiJl)
+QQ Group: 365936885, by wenjie
Wiki: [https://github.com/winlinvip/simple-rtmp-server/wiki](https://github.com/winlinvip/simple-rtmp-server/wiki)
StreamServers：[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https://github.com/wenjiegit/Bull-Live-Encoder), [NGINX-RTMP](https://github.com/arut/nginx-rtmp-module), [CRTMPD](http://www.rtmpd.com/), From 9f60a6738abeb98ece5d16548ad47409f3a4da8e Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 17 Nov 2014 10:27:05 +0800 Subject: [PATCH 3/3] add comments for listen --- trunk/src/app/srs_app_server.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index a7e9ea337..bb1d29ed5 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -130,18 +130,18 @@ int SrsListener::listen(int port) if ((fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) { ret = ERROR_SOCKET_CREATE; - srs_error("create linux socket error. ret=%d", ret); + srs_error("create linux socket error. port=%d, ret=%d", port, ret); return ret; } - srs_verbose("create linux socket success. fd=%d", fd); + srs_verbose("create linux socket success. port=%d, fd=%d", port, fd); int reuse_socket = 1; if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse_socket, sizeof(int)) == -1) { ret = ERROR_SOCKET_SETREUSE; - srs_error("setsockopt reuse-addr error. ret=%d", ret); + srs_error("setsockopt reuse-addr error. port=%d, ret=%d", port, ret); return ret; } - srs_verbose("setsockopt reuse-addr success. fd=%d", fd); + srs_verbose("setsockopt reuse-addr success. port=%d, fd=%d", port, fd); sockaddr_in addr; addr.sin_family = AF_INET; @@ -149,34 +149,34 @@ int SrsListener::listen(int port) addr.sin_addr.s_addr = INADDR_ANY; if (bind(fd, (const sockaddr*)&addr, sizeof(sockaddr_in)) == -1) { ret = ERROR_SOCKET_BIND; - srs_error("bind socket error. ret=%d", ret); + srs_error("bind socket error. port=%d, ret=%d", port, ret); return ret; } - srs_verbose("bind socket success. fd=%d", fd); + srs_verbose("bind socket success. port=%d, fd=%d", port, fd); if (::listen(fd, SERVER_LISTEN_BACKLOG) == -1) { ret = ERROR_SOCKET_LISTEN; - srs_error("listen socket error. ret=%d", ret); + srs_error("listen socket error. port=%d, ret=%d", port, ret); return ret; } - srs_verbose("listen socket success. fd=%d", fd); + srs_verbose("listen socket success. port=%d, fd=%d", port, fd); if ((stfd = st_netfd_open_socket(fd)) == NULL){ ret = ERROR_ST_OPEN_SOCKET; - srs_error("st_netfd_open_socket open socket failed. ret=%d", ret); + srs_error("st_netfd_open_socket open socket failed. port=%d, ret=%d", port, ret); return ret; } - srs_verbose("st open socket success. fd=%d", fd); + srs_verbose("st open socket success. port=%d, fd=%d", port, fd); if ((ret = pthread->start()) != ERROR_SUCCESS) { - srs_error("st_thread_create listen thread error. ret=%d", ret); + srs_error("st_thread_create listen thread error. port=%d, ret=%d", port, ret); return ret; } - srs_verbose("create st listen thread success."); + srs_verbose("create st listen thread success, port=%d", port); srs_trace("listen thread cid=%d, current_cid=%d, " - "listen at port=%d, type=%d, fd=%d started success", - pthread->cid(), _srs_context->get_id(), _port, _type, fd); + "listen at port=%d, type=%d, fd=%d started success, port=%d", + pthread->cid(), _srs_context->get_id(), _port, _type, fd, port); return ret; }