merge srs_app_st_socket to srs_app_st.

trunk/src/app/srs_app_caster_flv.cpp

@@ -38,7 +38,7 @@ using namespace std;
 #include <srs_kernel_flv.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_rtmp_utility.hpp>
-#include <srs_app_st_socket.hpp>
+#include <srs_app_st.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_rtmp_amf0.hpp>
 #include <srs_kernel_utility.hpp>

trunk/src/app/srs_app_edge.cpp

@@ -35,7 +35,7 @@ using namespace std;
 #include <srs_rtmp_io.hpp>
 #include <srs_app_config.hpp>
 #include <srs_rtmp_utility.hpp>
-#include <srs_app_st_socket.hpp>
+#include <srs_app_st.hpp>
 #include <srs_app_source.hpp>
 #include <srs_app_pithy_print.hpp>
 #include <srs_core_autofree.hpp>

trunk/src/app/srs_app_forward.cpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 using namespace std;
 
 #include <srs_app_source.hpp>
-#include <srs_app_st_socket.hpp>
+#include <srs_app_st.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_app_config.hpp>

trunk/src/app/srs_app_http_api.cpp

@@ -30,7 +30,7 @@ using namespace std;
 
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_app_st_socket.hpp>
+#include <srs_app_st.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_app_json.hpp>
 #include <srs_kernel_utility.hpp>

trunk/src/app/srs_app_http_client.cpp

@@ -31,7 +31,7 @@ using namespace std;
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_app_st_socket.hpp>
+#include <srs_app_st.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_core_autofree.hpp>

trunk/src/app/srs_app_http_conn.cpp

@@ -37,7 +37,7 @@ using namespace std;
 #include <srs_rtmp_utility.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_app_st_socket.hpp>
+#include <srs_app_st.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_app_config.hpp>
 #include <srs_kernel_utility.hpp>

trunk/src/app/srs_app_http_hooks.cpp

@@ -30,7 +30,7 @@ using namespace std;
 
 #include <srs_kernel_error.hpp>
 #include <srs_rtmp_stack.hpp>
-#include <srs_app_st_socket.hpp>
+#include <srs_app_st.hpp>
 #include <srs_app_json.hpp>
 #include <srs_app_dvr.hpp>
 #include <srs_app_http_client.hpp>

trunk/src/app/srs_app_mpegts_udp.cpp

@@ -43,7 +43,7 @@ using namespace std;
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_rtmp_stack.hpp>
-#include <srs_app_st_socket.hpp>
+#include <srs_app_st.hpp>
 #include <srs_rtmp_utility.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_rtmp_amf0.hpp>

trunk/src/app/srs_app_rtmp_conn.cpp

@@ -42,7 +42,7 @@ using namespace std;
 #include <srs_app_refer.hpp>
 #include <srs_app_hls.hpp>
 #include <srs_app_bandwidth.hpp>
-#include <srs_app_st_socket.hpp>
+#include <srs_app_st.hpp>
 #include <srs_app_http_hooks.hpp>
 #include <srs_app_edge.hpp>
 #include <srs_app_utility.hpp>

trunk/src/app/srs_app_rtsp.cpp

@@ -29,7 +29,7 @@ using namespace std;
 #include <srs_app_config.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_rtsp_stack.hpp>
-#include <srs_app_st_socket.hpp>
+#include <srs_app_st.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_core_autofree.hpp>

trunk/src/app/srs_app_st.cpp

@@ -26,6 +26,162 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 
+SrsStSocket::SrsStSocket(st_netfd_t client_stfd)
+{
+    stfd = client_stfd;
+    send_timeout = recv_timeout = ST_UTIME_NO_TIMEOUT;
+    recv_bytes = send_bytes = 0;
+}
+
+SrsStSocket::~SrsStSocket()
+{
+}
+
+bool SrsStSocket::is_never_timeout(int64_t timeout_us)
+{
+    return timeout_us == (int64_t)ST_UTIME_NO_TIMEOUT;
+}
+
+void SrsStSocket::set_recv_timeout(int64_t timeout_us)
+{
+    recv_timeout = timeout_us;
+}
+
+int64_t SrsStSocket::get_recv_timeout()
+{
+    return recv_timeout;
+}
+
+void SrsStSocket::set_send_timeout(int64_t timeout_us)
+{
+    send_timeout = timeout_us;
+}
+
+int64_t SrsStSocket::get_send_timeout()
+{
+    return send_timeout;
+}
+
+int64_t SrsStSocket::get_recv_bytes()
+{
+    return recv_bytes;
+}
+
+int64_t SrsStSocket::get_send_bytes()
+{
+    return send_bytes;
+}
+
+int SrsStSocket::read(void* buf, size_t size, ssize_t* nread)
+{
+    int ret = ERROR_SUCCESS;
+    
+    ssize_t nb_read = st_read(stfd, buf, size, recv_timeout);
+    if (nread) {
+        *nread = nb_read;
+    }
+    
+    // On success a non-negative integer indicating the number of bytes actually read is returned
+    // (a value of 0 means the network connection is closed or end of file is reached).
+    // Otherwise, a value of -1 is returned and errno is set to indicate the error.
+    if (nb_read <= 0) {
+        // @see https://github.com/simple-rtmp-server/srs/issues/200
+        if (nb_read < 0 && errno == ETIME) {
+            return ERROR_SOCKET_TIMEOUT;
+        }
+        
+        if (nb_read == 0) {
+            errno = ECONNRESET;
+        }
+        
+        return ERROR_SOCKET_READ;
+    }
+    
+    recv_bytes += nb_read;
+    
+    return ret;
+}
+
+int SrsStSocket::read_fully(void* buf, size_t size, ssize_t* nread)
+{
+    int ret = ERROR_SUCCESS;
+    
+    ssize_t nb_read = st_read_fully(stfd, buf, size, recv_timeout);
+    if (nread) {
+        *nread = nb_read;
+    }
+    
+    // On success a non-negative integer indicating the number of bytes actually read is returned
+    // (a value less than nbyte means the network connection is closed or end of file is reached)
+    // Otherwise, a value of -1 is returned and errno is set to indicate the error.
+    if (nb_read != (ssize_t)size) {
+        // @see https://github.com/simple-rtmp-server/srs/issues/200
+        if (nb_read < 0 && errno == ETIME) {
+            return ERROR_SOCKET_TIMEOUT;
+        }
+        
+        if (nb_read >= 0) {
+            errno = ECONNRESET;
+        }
+        
+        return ERROR_SOCKET_READ_FULLY;
+    }
+    
+    recv_bytes += nb_read;
+    
+    return ret;
+}
+
+int SrsStSocket::write(void* buf, size_t size, ssize_t* nwrite)
+{
+    int ret = ERROR_SUCCESS;
+    
+    ssize_t nb_write = st_write(stfd, buf, size, send_timeout);
+    if (nwrite) {
+        *nwrite = nb_write;
+    }
+    
+    // On success a non-negative integer equal to nbyte is returned.
+    // Otherwise, a value of -1 is returned and errno is set to indicate the error.
+    if (nb_write <= 0) {
+        // @see https://github.com/simple-rtmp-server/srs/issues/200
+        if (nb_write < 0 && errno == ETIME) {
+            return ERROR_SOCKET_TIMEOUT;
+        }
+        
+        return ERROR_SOCKET_WRITE;
+    }
+    
+    send_bytes += nb_write;
+    
+    return ret;
+}
+
+int SrsStSocket::writev(const iovec *iov, int iov_size, ssize_t* nwrite)
+{
+    int ret = ERROR_SUCCESS;
+    
+    ssize_t nb_write = st_writev(stfd, iov, iov_size, send_timeout);
+    if (nwrite) {
+        *nwrite = nb_write;
+    }
+    
+    // On success a non-negative integer equal to nbyte is returned.
+    // Otherwise, a value of -1 is returned and errno is set to indicate the error.
+    if (nb_write <= 0) {
+        // @see https://github.com/simple-rtmp-server/srs/issues/200
+        if (nb_write < 0 && errno == ETIME) {
+            return ERROR_SOCKET_TIMEOUT;
+        }
+        
+        return ERROR_SOCKET_WRITE;
+    }
+    
+    send_bytes += nb_write;
+    
+    return ret;
+}
+
 #ifdef __linux__
 #include <sys/epoll.h>
 

trunk/src/app/srs_app_st.hpp

@@ -32,6 +32,45 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <st.h>
 
+#include <srs_app_st.hpp>
+#include <srs_rtmp_io.hpp>
+
+/**
+ * the socket provides TCP socket over st,
+ * that is, the sync socket mechanism.
+ */
+class SrsStSocket : public ISrsProtocolReaderWriter
+{
+private:
+    int64_t recv_timeout;
+    int64_t send_timeout;
+    int64_t recv_bytes;
+    int64_t send_bytes;
+    st_netfd_t stfd;
+public:
+    SrsStSocket(st_netfd_t client_stfd);
+    virtual ~SrsStSocket();
+public:
+    virtual bool is_never_timeout(int64_t timeout_us);
+    virtual void set_recv_timeout(int64_t timeout_us);
+    virtual int64_t get_recv_timeout();
+    virtual void set_send_timeout(int64_t timeout_us);
+    virtual int64_t get_send_timeout();
+    virtual int64_t get_recv_bytes();
+    virtual int64_t get_send_bytes();
+public:
+    /**
+     * @param nread, the actual read bytes, ignore if NULL.
+     */
+    virtual int read(void* buf, size_t size, ssize_t* nread);
+    virtual int read_fully(void* buf, size_t size, ssize_t* nread);
+    /**
+     * @param nwrite, the actual write bytes, ignore if NULL.
+     */
+    virtual int write(void* buf, size_t size, ssize_t* nwrite);
+    virtual int writev(const iovec *iov, int iov_size, ssize_t* nwrite);
+};
+
 // initialize st, requires epoll.
 extern int srs_st_init();
 

trunk/src/app/srs_app_st_socket.cpp

@@ -1,184 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2013-2015 SRS(simple-rtmp-server)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <srs_app_st_socket.hpp>
-
-#include <srs_kernel_error.hpp>
-
-SrsStSocket::SrsStSocket(st_netfd_t client_stfd)
-{
-    stfd = client_stfd;
-    send_timeout = recv_timeout = ST_UTIME_NO_TIMEOUT;
-    recv_bytes = send_bytes = 0;
-}
-
-SrsStSocket::~SrsStSocket()
-{
-}
-
-bool SrsStSocket::is_never_timeout(int64_t timeout_us)
-{
-    return timeout_us == (int64_t)ST_UTIME_NO_TIMEOUT;
-}
-
-void SrsStSocket::set_recv_timeout(int64_t timeout_us)
-{
-    recv_timeout = timeout_us;
-}
-
-int64_t SrsStSocket::get_recv_timeout()
-{
-    return recv_timeout;
-}
-
-void SrsStSocket::set_send_timeout(int64_t timeout_us)
-{
-    send_timeout = timeout_us;
-}
-
-int64_t SrsStSocket::get_send_timeout()
-{
-    return send_timeout;
-}
-
-int64_t SrsStSocket::get_recv_bytes()
-{
-    return recv_bytes;
-}
-
-int64_t SrsStSocket::get_send_bytes()
-{
-    return send_bytes;
-}
-
-int SrsStSocket::read(void* buf, size_t size, ssize_t* nread)
-{
-    int ret = ERROR_SUCCESS;
-    
-    ssize_t nb_read = st_read(stfd, buf, size, recv_timeout);
-    if (nread) {
-        *nread = nb_read;
-    }
-    
-    // On success a non-negative integer indicating the number of bytes actually read is returned 
-    // (a value of 0 means the network connection is closed or end of file is reached).
-    // Otherwise, a value of -1 is returned and errno is set to indicate the error. 
-    if (nb_read <= 0) {
-        // @see https://github.com/simple-rtmp-server/srs/issues/200
-        if (nb_read < 0 && errno == ETIME) {
-            return ERROR_SOCKET_TIMEOUT;
-        }
-        
-        if (nb_read == 0) {
-            errno = ECONNRESET;
-        }
-        
-        return ERROR_SOCKET_READ;
-    }
-    
-    recv_bytes += nb_read;
-        
-    return ret;
-}
-
-int SrsStSocket::read_fully(void* buf, size_t size, ssize_t* nread)
-{
-    int ret = ERROR_SUCCESS;
-    
-    ssize_t nb_read = st_read_fully(stfd, buf, size, recv_timeout);
-    if (nread) {
-        *nread = nb_read;
-    }
-    
-    // On success a non-negative integer indicating the number of bytes actually read is returned 
-    // (a value less than nbyte means the network connection is closed or end of file is reached)
-    // Otherwise, a value of -1 is returned and errno is set to indicate the error. 
-    if (nb_read != (ssize_t)size) {
-        // @see https://github.com/simple-rtmp-server/srs/issues/200
-        if (nb_read < 0 && errno == ETIME) {
-            return ERROR_SOCKET_TIMEOUT;
-        }
-        
-        if (nb_read >= 0) {
-            errno = ECONNRESET;
-        }
-        
-        return ERROR_SOCKET_READ_FULLY;
-    }
-    
-    recv_bytes += nb_read;
-    
-    return ret;
-}
-
-int SrsStSocket::write(void* buf, size_t size, ssize_t* nwrite)
-{
-    int ret = ERROR_SUCCESS;
-    
-    ssize_t nb_write = st_write(stfd, buf, size, send_timeout);
-    if (nwrite) {
-        *nwrite = nb_write;
-    }
-    
-    // On success a non-negative integer equal to nbyte is returned. 
-    // Otherwise, a value of -1 is returned and errno is set to indicate the error.
-    if (nb_write <= 0) {
-        // @see https://github.com/simple-rtmp-server/srs/issues/200
-        if (nb_write < 0 && errno == ETIME) {
-            return ERROR_SOCKET_TIMEOUT;
-        }
-        
-        return ERROR_SOCKET_WRITE;
-    }
-    
-    send_bytes += nb_write;
-        
-    return ret;
-}
-
-int SrsStSocket::writev(const iovec *iov, int iov_size, ssize_t* nwrite)
-{
-    int ret = ERROR_SUCCESS;
-    
-    ssize_t nb_write = st_writev(stfd, iov, iov_size, send_timeout);
-    if (nwrite) {
-        *nwrite = nb_write;
-    }
-    
-    // On success a non-negative integer equal to nbyte is returned. 
-    // Otherwise, a value of -1 is returned and errno is set to indicate the error.
-    if (nb_write <= 0) {
-        // @see https://github.com/simple-rtmp-server/srs/issues/200
-        if (nb_write < 0 && errno == ETIME) {
-            return ERROR_SOCKET_TIMEOUT;
-        }
-        
-        return ERROR_SOCKET_WRITE;
-    }
-    
-    send_bytes += nb_write;
-    
-    return ret;
-}
-
-

trunk/src/app/srs_app_st_socket.hpp

@@ -1,72 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2013-2015 SRS(simple-rtmp-server)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef SRS_APP_ST_SOCKET_HPP
-#define SRS_APP_ST_SOCKET_HPP
-
-/*
-#include <srs_app_st_socket.hpp>
-*/
-
-#include <srs_core.hpp>
-
-#include <srs_app_st.hpp>
-#include <srs_rtmp_io.hpp>
-
-/**
-* the socket provides TCP socket over st,
-* that is, the sync socket mechanism.
-*/
-class SrsStSocket : public ISrsProtocolReaderWriter
-{
-private:
-    int64_t recv_timeout;
-    int64_t send_timeout;
-    int64_t recv_bytes;
-    int64_t send_bytes;
-    st_netfd_t stfd;
-public:
-    SrsStSocket(st_netfd_t client_stfd);
-    virtual ~SrsStSocket();
-public:
-    virtual bool is_never_timeout(int64_t timeout_us);
-    virtual void set_recv_timeout(int64_t timeout_us);
-    virtual int64_t get_recv_timeout();
-    virtual void set_send_timeout(int64_t timeout_us);
-    virtual int64_t get_send_timeout();
-    virtual int64_t get_recv_bytes();
-    virtual int64_t get_send_bytes();
-public:
-    /**
-    * @param nread, the actual read bytes, ignore if NULL.
-    */
-    virtual int read(void* buf, size_t size, ssize_t* nread);
-    virtual int read_fully(void* buf, size_t size, ssize_t* nread);
-    /**
-    * @param nwrite, the actual write bytes, ignore if NULL.
-    */
-    virtual int write(void* buf, size_t size, ssize_t* nwrite);
-    virtual int writev(const iovec *iov, int iov_size, ssize_t* nwrite);
-};
-
-#endif

trunk/src/main/srs_main_ingest_hls.cpp

@@ -42,7 +42,7 @@ using namespace std;
 #include <srs_core_autofree.hpp>
 #include <srs_app_st.hpp>
 #include <srs_rtmp_utility.hpp>
-#include <srs_app_st_socket.hpp>
+#include <srs_app_st.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_rtmp_amf0.hpp>
 #include <srs_raw_avc.hpp>