merge handshake to protocol

trunk/configure

@@ -516,8 +516,8 @@ if [ $SRS_LIBRTMP = YES ]; then
 fi
 #
 # utest, the unit-test cases of srs, base on gtest1.6
-MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_handshake" 
+MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_protocol" 
-        "srs_utest_protocol" "srs_utest_kernel" "srs_utest_core")
+        "srs_utest_kernel" "srs_utest_core")
 ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot})
 ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
 MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP")

trunk/src/srs/srs.upp

@@ -116,8 +116,6 @@ file
 	..\utest\srs_utest_amf0.cpp,
 	..\utest\srs_utest_core.hpp,
 	..\utest\srs_utest_core.cpp,
-	..\utest\srs_utest_handshake.hpp,
-	..\utest\srs_utest_handshake.cpp,
 	..\utest\srs_utest_kernel.hpp,
 	..\utest\srs_utest_kernel.cpp,
 	..\utest\srs_utest_protocol.hpp,

trunk/src/utest/srs_utest_handshake.hpp

@@ -1,69 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2013-2014 winlin
-
-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_UTEST_HANDSHAKE_HPP
-#define SRS_UTEST_HANDSHAKE_HPP
-
-/*
-#include <srs_utest_handshake.hpp>
-*/
-#include <srs_utest.hpp>
-
-#include <srs_protocol_rtmp.hpp>
-#include <srs_protocol_handshake.hpp>
-
-#ifdef SRS_AUTO_SSL
-using namespace srs;
-#endif
-
-#include <srs_protocol_io.hpp>
-
-class MockEmptyIO : public ISrsProtocolReaderWriter
-{
-public:
-    MockEmptyIO();
-    virtual ~MockEmptyIO();
-// for protocol
-public:
-    virtual bool is_never_timeout(int64_t timeout_us);
-// for handshake.
-public:
-    virtual int read_fully(void* buf, size_t size, ssize_t* nread);
-    virtual int write(void* buf, size_t size, ssize_t* nwrite);
-// for protocol
-public:
-    virtual void set_recv_timeout(int64_t timeout_us);
-    virtual int64_t get_recv_timeout();
-    virtual int64_t get_recv_bytes();
-// for protocol
-public:
-    virtual void set_send_timeout(int64_t timeout_us);
-    virtual int64_t get_send_timeout();
-    virtual int64_t get_send_bytes();
-    virtual int writev(const iovec *iov, int iov_size, ssize_t* nwrite);
-// for protocol/amf0/msg-codec
-public:
-    virtual int read(void* buf, size_t size, ssize_t* nread);
-};
-
-#endif

trunk/src/utest/srs_utest_protocol.hpp

@@ -32,4 +32,41 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string>
 #include <srs_protocol_utility.hpp>
 
+#include <srs_protocol_rtmp.hpp>
+#include <srs_protocol_handshake.hpp>
+
+#ifdef SRS_AUTO_SSL
+using namespace srs;
+#endif
+
+#include <srs_protocol_io.hpp>
+
+class MockEmptyIO : public ISrsProtocolReaderWriter
+{
+public:
+    MockEmptyIO();
+    virtual ~MockEmptyIO();
+// for protocol
+public:
+    virtual bool is_never_timeout(int64_t timeout_us);
+// for handshake.
+public:
+    virtual int read_fully(void* buf, size_t size, ssize_t* nread);
+    virtual int write(void* buf, size_t size, ssize_t* nwrite);
+// for protocol
+public:
+    virtual void set_recv_timeout(int64_t timeout_us);
+    virtual int64_t get_recv_timeout();
+    virtual int64_t get_recv_bytes();
+// for protocol
+public:
+    virtual void set_send_timeout(int64_t timeout_us);
+    virtual int64_t get_send_timeout();
+    virtual int64_t get_send_bytes();
+    virtual int writev(const iovec *iov, int iov_size, ssize_t* nwrite);
+// for protocol/amf0/msg-codec
+public:
+    virtual int read(void* buf, size_t size, ssize_t* nread);
+};
+
 #endif