For #913, RTMP support complex error.

ossrs · Jan 1, 2018 · 70a20ff · 70a20ff
1 parent 60accb6
commit 70a20ff
Show file tree

Hide file tree

Showing 4 changed files with 399 additions and 736 deletions.
diff --git a/trunk/src/protocol/srs_protocol_utility.cpp b/trunk/src/protocol/srs_protocol_utility.cpp
@@ -193,9 +193,9 @@ string srs_generate_vis_tc_url(string ip, string vhost, string app, int port, st
 }
 
 template<typename T>
-int srs_do_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, T** ppmsg)
+srs_error_t srs_do_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, T** ppmsg)
 {
-    int ret = ERROR_SUCCESS;
+    srs_error_t err = srs_success;
 
     *ppmsg = NULL;
     T* msg = NULL;
@@ -205,63 +205,61 @@ int srs_do_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size,
         header.initialize_audio(size, timestamp, stream_id);
 
         msg = new T();
-        if ((ret = msg->create(&header, data, size)) != ERROR_SUCCESS) {
+        if ((err = msg->create(&header, data, size)) != srs_success) {
             srs_freep(msg);
-            return ret;
+            return srs_error_wrap(err, "create message");
         }
     } else if (type == SrsFrameTypeVideo) {
         SrsMessageHeader header;
         header.initialize_video(size, timestamp, stream_id);
 
         msg = new T();
-        if ((ret = msg->create(&header, data, size)) != ERROR_SUCCESS) {
+        if ((err = msg->create(&header, data, size)) != srs_success) {
             srs_freep(msg);
-            return ret;
+            return srs_error_wrap(err, "create message");
         }
     } else if (type == SrsFrameTypeScript) {
         SrsMessageHeader header;
         header.initialize_amf0_script(size, stream_id);
 
         msg = new T();
-        if ((ret = msg->create(&header, data, size)) != ERROR_SUCCESS) {
+        if ((err = msg->create(&header, data, size)) != srs_success) {
             srs_freep(msg);
-            return ret;
+            return srs_error_wrap(err, "create message");
         }
     } else {
-        ret = ERROR_STREAM_CASTER_FLV_TAG;
-        srs_error("rtmp unknown tag type=%#x. ret=%d", type, ret);
-        return ret;
+        return srs_error_new(ERROR_STREAM_CASTER_FLV_TAG, "unknown tag=%#x", (uint8_t)type);
     }
 
     *ppmsg = msg;
 
-    return ret;
+    return err;
 }
 
-int srs_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, SrsSharedPtrMessage** ppmsg)
+srs_error_t srs_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, SrsSharedPtrMessage** ppmsg)
 {
-    int ret = ERROR_SUCCESS;
+    srs_error_t err = srs_success;
 
     // only when failed, we must free the data.
-    if ((ret = srs_do_rtmp_create_msg(type, timestamp, data, size, stream_id, ppmsg)) != ERROR_SUCCESS) {
+    if ((err = srs_do_rtmp_create_msg(type, timestamp, data, size, stream_id, ppmsg)) != srs_success) {
         srs_freepa(data);
-        return ret;
+        return srs_error_wrap(err, "create message");
     }
 
-    return ret;
+    return err;
 }
 
-int srs_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, SrsCommonMessage** ppmsg)
+srs_error_t srs_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, SrsCommonMessage** ppmsg)
 {
-    int ret = ERROR_SUCCESS;
+    srs_error_t err = srs_success;
 
     // only when failed, we must free the data.
-    if ((ret = srs_do_rtmp_create_msg(type, timestamp, data, size, stream_id, ppmsg)) != ERROR_SUCCESS) {
+    if ((err = srs_do_rtmp_create_msg(type, timestamp, data, size, stream_id, ppmsg)) != srs_success) {
         srs_freepa(data);
-        return ret;
+        return srs_error_wrap(err, "create message");
     }
 
-    return ret;
+    return err;
 }
 
 string srs_generate_stream_url(string vhost, string app, string stream)

diff --git a/trunk/src/protocol/srs_protocol_utility.hpp b/trunk/src/protocol/srs_protocol_utility.hpp
@@ -95,8 +95,8 @@ extern std::string srs_generate_vis_tc_url(std::string ip, std::string vhost, st
  * @param data the packet bytes. user should never free it.
  * @param ppmsg output the shared ptr message. user should free it.
  */
-extern int srs_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, SrsSharedPtrMessage** ppmsg);
-extern int srs_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, SrsCommonMessage** ppmsg);
+extern srs_error_t srs_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, SrsSharedPtrMessage** ppmsg);
+extern srs_error_t srs_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, SrsCommonMessage** ppmsg);
 
 // get the stream identify, vhost/app/stream.
 extern std::string srs_generate_stream_url(std::string vhost, std::string app, std::string stream);

diff --git a/trunk/src/protocol/srs_rtmp_handshake.cpp b/trunk/src/protocol/srs_rtmp_handshake.cpp
@@ -895,8 +895,6 @@ namespace _srs_internal
 
     srs_error_t c1s1::parse(char* _c1s1, int size, srs_schema_type schema)
     {
-        srs_error_t err = srs_success;
-
         srs_assert(size == 1536);
 
         if (schema != srs_schema0 && schema != srs_schema1) {
@@ -920,8 +918,6 @@ namespace _srs_internal
 
     srs_error_t c1s1::c1_create(srs_schema_type schema)
     {
-        srs_error_t err = srs_success;
-
         if (schema != srs_schema0 && schema != srs_schema1) {
             return srs_error_new(ERROR_RTMP_CH_SCHEMA, "create c1 failed. invalid schema=%d", schema);
         }
@@ -950,8 +946,6 @@ namespace _srs_internal
 
     srs_error_t c1s1::s1_create(c1s1* c1)
     {
-        srs_error_t err = srs_success;
-
         if (c1->schema() != srs_schema0 && c1->schema() != srs_schema1) {
             return srs_error_new(ERROR_RTMP_CH_SCHEMA, "create s1 failed. invalid schema=%d", c1->schema());
         }