move handshake and rtmp to protocol module

@@ -141,20 +141,21 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
 #Protocol, depends on core/kernel, provides rtmp/htttp protocol features.
 #Protocol, depends on core/kernel, provides rtmp/htttp protocol features.
 MODULE_ID="PROTOCOL" 
 MODULE_ID="PROTOCOL" 
 MODULE_DEPENDS=("CORE" "KERNEL") 
 MODULE_DEPENDS=("CORE" "KERNEL") 
-ModuleLibIncs=(${SRS_OBJS})
-MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_rtmp_stack")
+ModuleLibIncs=(${SRS_OBJS} ${LibSSLRoot})
+MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_rtmp_stack" "srs_protocol_rtmp"
+        "srs_protocol_handshake")
 MODULE_DIR="src/pro" . auto/modules.sh
 MODULE_DIR="src/pro" . auto/modules.sh
 PROTOCOL_OBJS="${MODULE_OBJS[@]}"
 PROTOCOL_OBJS="${MODULE_OBJS[@]}"
 #
 #
 #App Module
 #App Module
 MODULE_ID="APP" 
 MODULE_ID="APP" 
 MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL") 
 MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL") 
-ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS})
+ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS})
 MODULE_FILES=("srs_core_server" 
 MODULE_FILES=("srs_core_server" 
         "srs_core_conn" "srs_core_client" 
         "srs_core_conn" "srs_core_client" 
-        "srs_core_rtmp" "srs_core_socket" 
+        "srs_core_socket" 
         "srs_core_source" "srs_core_codec"
         "srs_core_source" "srs_core_codec"
-        "srs_core_handshake" "srs_core_refer"
+        "srs_core_refer"
         "srs_core_hls" "srs_core_forward" "srs_core_encoder"
         "srs_core_hls" "srs_core_forward" "srs_core_encoder"
         "srs_core_http" "srs_core_thread" "srs_core_bandwidth"
         "srs_core_http" "srs_core_thread" "srs_core_bandwidth"
         "srs_core_st" "srs_core_log_context")
         "srs_core_st" "srs_core_log_context")

@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 using namespace std;
 using namespace std;
 
 
-#include <srs_core_rtmp.hpp>
+#include <srs_protocol_rtmp.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_rtmp_stack.hpp>

@@ -30,7 +30,7 @@ using namespace std;
 
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_core_rtmp.hpp>
+#include <srs_protocol_rtmp.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_core_source.hpp>
 #include <srs_core_source.hpp>

@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_kernel_config.hpp>
-#include <srs_core_rtmp.hpp>
+#include <srs_protocol_rtmp.hpp>
 #include <srs_kernel_pithy_print.hpp>
 #include <srs_kernel_pithy_print.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 
 

@@ -29,11 +29,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <arpa/inet.h>
 #include <arpa/inet.h>
 
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_core_rtmp.hpp>
+#include <srs_protocol_rtmp.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_pithy_print.hpp>
 #include <srs_kernel_pithy_print.hpp>
-#include <srs_core_rtmp.hpp>
+#include <srs_protocol_rtmp.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_core_source.hpp>
 #include <srs_core_source.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_core_autofree.hpp>

@@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_config.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_core_source.hpp>
 #include <srs_core_source.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_core_rtmp.hpp>
+#include <srs_protocol_rtmp.hpp>
 #include <srs_kernel_pithy_print.hpp>
 #include <srs_kernel_pithy_print.hpp>
 
 
 // max PES packets size to flush the video.
 // max PES packets size to flush the video.

@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <arpa/inet.h>
 #include <arpa/inet.h>
 
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_core_rtmp.hpp>
+#include <srs_protocol_rtmp.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_core_socket.hpp>
 #include <srs_core_socket.hpp>
 
 

@@ -35,7 +35,7 @@ using namespace std;
 #include <srs_core_forward.hpp>
 #include <srs_core_forward.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_core_encoder.hpp>
 #include <srs_core_encoder.hpp>
-#include <srs_core_rtmp.hpp>
+#include <srs_protocol_rtmp.hpp>
 
 
 #define CONST_MAX_JITTER_MS 		500
 #define CONST_MAX_JITTER_MS 		500
 #define DEFAULT_FRAME_TIME_MS 		40
 #define DEFAULT_FRAME_TIME_MS 		40

@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <getopt.h>
 #include <getopt.h>
 #include <stdlib.h>
 #include <stdlib.h>
 
 
-#include <srs_core_rtmp.hpp>
+#include <srs_protocol_rtmp.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_amf0.hpp>

@@ -21,14 +21,14 @@ 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.
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 */
 
 
-#include <srs_core_handshake.hpp>
+#include <srs_protocol_handshake.hpp>
 
 
 #include <time.h>
 #include <time.h>
 #include <stdlib.h>
 #include <stdlib.h>
 
 
+#include <srs_core_autofree.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_core_autofree.hpp>
 #include <srs_protocol_io.hpp>
 #include <srs_protocol_io.hpp>
 
 
 void srs_random_generate(char* bytes, int size)
 void srs_random_generate(char* bytes, int size)

@@ -21,11 +21,11 @@ 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.
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 */
 
 
-#ifndef SRS_CORE_HANDSHKAE_HPP
-#define SRS_CORE_HANDSHKAE_HPP
+#ifndef SRS_PROTOCOL_HANDSHKAE_HPP
+#define SRS_PROTOCOL_HANDSHKAE_HPP
 
 
 /*
 /*
-#include <srs_core_complex_handshake.hpp>
+#include <srs_protocol_handshake.hpp>
 */
 */
 
 
 #include <srs_core.hpp>
 #include <srs_core.hpp>

@@ -21,16 +21,16 @@ 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.
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 */
 
 
-#include <srs_core_rtmp.hpp>
+#include <srs_protocol_rtmp.hpp>
 
 
+#include <srs_core_autofree.hpp>
+#include <srs_protocol_handshake.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_error.hpp>
+#include <srs_kernel_config.hpp>
 #include <srs_protocol_io.hpp>
 #include <srs_protocol_io.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
 #include <srs_protocol_rtmp_stack.hpp>
-#include <srs_core_autofree.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_amf0.hpp>
-#include <srs_core_handshake.hpp>
-#include <srs_kernel_config.hpp>
 
 
 using namespace std;
 using namespace std;
 
 

@@ -21,19 +21,17 @@ 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.
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 */
 
 
-#ifndef SRS_CORE_RTMP_HPP
-#define SRS_CORE_RTMP_HPP
+#ifndef SRS_PROTOCOL_RTMP_HPP
+#define SRS_PROTOCOL_RTMP_HPP
 
 
 /*
 /*
-#include <srs_core_rtmp.hpp>
+#include <srs_protocol_rtmp.hpp>
 */
 */
 
 
 #include <srs_core.hpp>
 #include <srs_core.hpp>
 
 
 #include <string>
 #include <string>
 
 
-#include <srs_core_st.hpp>
-
 class SrsProtocol;
 class SrsProtocol;
 class ISrsProtocolReaderWriter;
 class ISrsProtocolReaderWriter;
 class ISrsMessage;
 class ISrsMessage;

@@ -27,8 +27,12 @@ file
     protocol readonly separator,
     protocol readonly separator,
     ..\pro\srs_protocol_amf0.hpp,
     ..\pro\srs_protocol_amf0.hpp,
     ..\pro\srs_protocol_amf0.cpp,
     ..\pro\srs_protocol_amf0.cpp,
+    ..\app\srs_protocol_handshake.hpp,
+    ..\app\srs_protocol_handshake.cpp,
     ..\pro\srs_protocol_io.hpp,
     ..\pro\srs_protocol_io.hpp,
     ..\pro\srs_protocol_io.cpp,
     ..\pro\srs_protocol_io.cpp,
+    ..\pro\srs_protocol_rtmp.hpp,
+    ..\pro\srs_protocol_rtmp.cpp,
     ..\pro\srs_protocol_rtmp_stack.hpp,
     ..\pro\srs_protocol_rtmp_stack.hpp,
     ..\pro\srs_protocol_rtmp_stack.cpp,
     ..\pro\srs_protocol_rtmp_stack.cpp,
     app readonly separator,
     app readonly separator,
@@ -44,8 +48,6 @@ file
     ..\app\srs_core_encoder.cpp,
     ..\app\srs_core_encoder.cpp,
     ..\app\srs_core_forward.hpp,
     ..\app\srs_core_forward.hpp,
     ..\app\srs_core_forward.cpp,
     ..\app\srs_core_forward.cpp,
-    ..\app\srs_core_handshake.hpp,
-    ..\app\srs_core_handshake.cpp,
     ..\app\srs_core_hls.hpp,
     ..\app\srs_core_hls.hpp,
     ..\app\srs_core_hls.cpp,
     ..\app\srs_core_hls.cpp,
     ..\app\srs_core_http.hpp,
     ..\app\srs_core_http.hpp,
@@ -54,8 +56,6 @@ file
     ..\app\srs_core_log_context.cpp,
     ..\app\srs_core_log_context.cpp,
     ..\app\srs_core_refer.hpp,
     ..\app\srs_core_refer.hpp,
     ..\app\srs_core_refer.cpp,
     ..\app\srs_core_refer.cpp,
-    ..\app\srs_core_rtmp.hpp,
-    ..\app\srs_core_rtmp.cpp,
     ..\app\srs_core_thread.hpp,
     ..\app\srs_core_thread.hpp,
     ..\app\srs_core_thread.cpp,
     ..\app\srs_core_thread.cpp,
     ..\app\srs_core_server.hpp,
     ..\app\srs_core_server.hpp,