external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

For #907, Wrap ST, only use in service ST.

Browse source
This commit is contained in:
winlin 2017-05-30 09:05:02 +08:00
parent 54411e0768
commit 1bf99e8f3e
49 changed files with 340 additions and 513 deletions
Download patch file Download diff file Expand all files Collapse all files

13
trunk/src/app/srs_app_server.hpp
View file

@ -35,6 +35,7 @@
#include <srs_app_hls.hpp>
#include <srs_app_listener.hpp>
#include <srs_app_conn.hpp>
#include <srs_service_st.hpp>
class SrsServer;
class SrsConnection;
@ -107,7 +108,7 @@ public:
virtual int listen(std::string ip, int port);
// ISrsTcpHandler
public:
virtual int on_tcp_client(st_netfd_t stfd);
virtual int on_tcp_client(srs_netfd_t stfd);
};
#ifdef SRS_AUTO_STREAM_CASTER
@ -126,7 +127,7 @@ public:
virtual int listen(std::string i, int p);
// ISrsTcpHandler
public:
virtual int on_tcp_client(st_netfd_t stfd);
virtual int on_tcp_client(srs_netfd_t stfd);
};
/**
@ -144,7 +145,7 @@ public:
virtual int listen(std::string i, int p);
// ISrsTcpHandler
public:
virtual int on_tcp_client(st_netfd_t stfd);
virtual int on_tcp_client(srs_netfd_t stfd);
};
#endif
@ -185,7 +186,7 @@ private:
/* Per-process pipe which is used as a signal queue. */
/* Up to PIPE_BUF/sizeof(int) signals can be queued up. */
int sig_pipe[2];
st_netfd_t signal_read_stfd;
srs_netfd_t signal_read_stfd;
private:
SrsServer* server;
SrsCoroutine* trd;
@ -357,9 +358,9 @@ public:
* for instance RTMP connection to serve client.
* @param stfd, the client fd in st boxed, the underlayer fd.
*/
virtual int accept_client(SrsListenerType type, st_netfd_t stfd);
virtual int accept_client(SrsListenerType type, srs_netfd_t stfd);
private:
virtual SrsConnection* fd2conn(SrsListenerType type, st_netfd_t stfd);
virtual SrsConnection* fd2conn(SrsListenerType type, srs_netfd_t stfd);
// IConnectionManager
public:
/**