external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Refine ST service.

Browse source
This commit is contained in:
winlin 2019-05-05 08:17:48 +08:00
parent a4160308f5
commit 202a584aab
4 changed files with 53 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
trunk/src/app/srs_app_listener.cpp
View file

@ -132,8 +132,13 @@ srs_error_t SrsUdpListener::listen()
return srs_error_new(ERROR_SOCKET_CREATE, "create socket. ip=%s, port=%d", ip.c_str(), port); return srs_error_new(ERROR_SOCKET_CREATE, "create socket. ip=%s, port=%d", ip.c_str(), port);
} }
srs_fd_close_exec(_fd); if ((err = srs_fd_closeexec(_fd)) != srs_success) {
srs_socket_reuse_addr(_fd); return srs_error_wrap(err, "set closeexec");
}
if ((err = srs_fd_reuseaddr(_fd)) != srs_success) {
return srs_error_wrap(err, "set reuseaddr");
}
if (bind(_fd, r->ai_addr, r->ai_addrlen) == -1) { if (bind(_fd, r->ai_addr, r->ai_addrlen) == -1) {
return srs_error_new(ERROR_SOCKET_BIND, "bind socket. ep=%s:%d", ip.c_str(), port);; return srs_error_new(ERROR_SOCKET_BIND, "bind socket. ep=%s:%d", ip.c_str(), port);;
@ -230,15 +235,17 @@ srs_error_t SrsTcpListener::listen()
// Detect alive for TCP connection. // Detect alive for TCP connection.
// @see https://github.com/ossrs/srs/issues/1044 // @see https://github.com/ossrs/srs/issues/1044
#ifdef SO_KEEPALIVE if ((err = srs_fd_keepalive(_fd)) != srs_success) {
int tcp_keepalive = 1; return srs_error_wrap(err, "set keepalive");
if (setsockopt(_fd, SOL_SOCKET, SO_KEEPALIVE, &tcp_keepalive, sizeof(int)) == -1) {
return srs_error_new(ERROR_SOCKET_SETKEEPALIVE, "setsockopt SO_KEEPALIVE[%d]error. port=%d", tcp_keepalive, port);
} }
#endif
srs_fd_close_exec(_fd); if ((err = srs_fd_closeexec(_fd)) != srs_success) {
srs_socket_reuse_addr(_fd); return srs_error_wrap(err, "set closeexec");
}
if ((err = srs_fd_reuseaddr(_fd)) != srs_success) {
return srs_error_wrap(err, "set reuseaddr");
}
if (bind(_fd, r->ai_addr, r->ai_addrlen) == -1) { if (bind(_fd, r->ai_addr, r->ai_addrlen) == -1) {
return srs_error_new(ERROR_SOCKET_BIND, "bind socket. ep=%s:%d", ip.c_str(), port);; return srs_error_new(ERROR_SOCKET_BIND, "bind socket. ep=%s:%d", ip.c_str(), port);;
@ -276,7 +283,10 @@ srs_error_t SrsTcpListener::cycle()
} }
int cfd = srs_netfd_fileno(cstfd); int cfd = srs_netfd_fileno(cstfd);
srs_fd_close_exec(cfd);
if ((err = srs_fd_closeexec(cfd)) != srs_success) {
return srs_error_wrap(err, "set closeexec");
}
if ((err = handler->on_tcp_client(cstfd)) != srs_success) { if ((err = handler->on_tcp_client(cstfd)) != srs_success) {
return srs_error_wrap(err, "handle fd=%d", cfd); return srs_error_wrap(err, "handle fd=%d", cfd);

2
trunk/src/kernel/srs_kernel_error.hpp
View file

@ -115,6 +115,8 @@
#define ERROR_SOCKET_NO_NODELAY 1076 #define ERROR_SOCKET_NO_NODELAY 1076
#define ERROR_SOCKET_SNDBUF 1077 #define ERROR_SOCKET_SNDBUF 1077
#define ERROR_THREAD_STARTED 1078 #define ERROR_THREAD_STARTED 1078
#define ERROR_SOCKET_SETREUSEADDR 1079
#define ERROR_SOCKET_SETCLOSEEXEC 1080
/////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
// RTMP protocol error. // RTMP protocol error.

28
trunk/src/service/srs_service_st.cpp
View file

@ -86,17 +86,37 @@ void srs_close_stfd(srs_netfd_t& stfd)
} }
} }
void srs_fd_close_exec(int fd) srs_error_t srs_fd_closeexec(int fd)
{ {
int flags = fcntl(fd, F_GETFD); int flags = fcntl(fd, F_GETFD);
flags |= FD_CLOEXEC; flags |= FD_CLOEXEC;
fcntl(fd, F_SETFD, flags); if (fcntl(fd, F_SETFD, flags) == -1) {
return srs_error_new(ERROR_SOCKET_SETCLOSEEXEC, "FD_CLOEXEC fd=%v", fd);
}
return srs_success;
} }
void srs_socket_reuse_addr(int fd) srs_error_t srs_fd_reuseaddr(int fd)
{ {
int v = 1; int v = 1;
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &v, sizeof(int)); if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &v, sizeof(int)) == -1) {
return srs_error_new(ERROR_SOCKET_SETREUSEADDR, "SO_REUSEADDR fd=%v", fd);
}
return srs_success;
}
srs_error_t srs_fd_keepalive(int fd)
{
#ifdef SO_KEEPALIVE
int v = 1;
if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &v, sizeof(int)) == -1) {
return srs_error_new(ERROR_SOCKET_SETKEEPALIVE, "SO_KEEPALIVE fd=%d", fd);
}
#endif
return srs_success;
} }
srs_thread_t srs_thread_self() srs_thread_t srs_thread_self()

9
trunk/src/service/srs_service_st.hpp
View file

@ -44,10 +44,13 @@ extern srs_error_t srs_st_init();
extern void srs_close_stfd(srs_netfd_t& stfd); extern void srs_close_stfd(srs_netfd_t& stfd);
// Set the FD_CLOEXEC of FD. // Set the FD_CLOEXEC of FD.
extern void srs_fd_close_exec(int fd); extern srs_error_t srs_fd_closeexec(int fd);
// Set the SO_REUSEADDR of socket. // Set the SO_REUSEADDR of fd.
extern void srs_socket_reuse_addr(int fd); extern srs_error_t srs_fd_reuseaddr(int fd);
// Set the SO_KEEPALIVE of fd.
extern srs_error_t srs_fd_keepalive(int fd);
// Get current coroutine/thread. // Get current coroutine/thread.
extern srs_thread_t srs_thread_self(); extern srs_thread_t srs_thread_self();