For #1031, SRS edge support douyu.com. 2.0.250

ossrs · Aug 1, 2018 · 586899a · 586899a
1 parent 6d7c741
commit 586899a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -333,6 +333,7 @@ Remark:
 
 ## History
 
+* v2.0, 2018-08-02, For [#1031][bug #1031], SRS edge support douyu.com. 2.0.250
 * v2.0, 2018-07-21, Merge [#1119][bug #1119], fix memory leak. 2.0.249
 * <strong>v2.0, 2018-07-18, [2.0 release3(2.0.248)][r2.0r3] released. 86775 lines.</strong>
 * v2.0, 2018-07-17, Merge [#1176][bug #1176], fix scaned issues. 2.0.248
@@ -1313,6 +1314,7 @@ Winlin
 [bug #1077]: https://github.com/ossrs/srs/issues/1077
 [bug #1176]: https://github.com/ossrs/srs/issues/1176
 [bug #1119]: https://github.com/ossrs/srs/issues/1119
+[bug #1031]: https://github.com/ossrs/srs/issues/1031
 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
 
 [exo #828]: https://github.com/google/ExoPlayer/pull/828

diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp
@@ -462,11 +462,20 @@ int SrsEdgeForwarder::start()
         return ret;
     }
 
-    if ((ret = client->publish(req->stream, stream_id)) != ERROR_SUCCESS) {
-        srs_error("publish failed, stream=%s, stream_id=%d. ret=%d", 
-            req->stream.c_str(), stream_id, ret);
+    string stream = req->stream;
+    // Pass params in stream, @see https://github.com/ossrs/srs/issues/1031#issuecomment-409745733
+    if (!req->param.empty()) {
+        if (req->param.find("?") != 0) {
+            stream += "?";
+        }
+        stream += req->param;
+    }
+
+    if ((ret = client->publish(stream, stream_id)) != ERROR_SUCCESS) {
+        srs_error("publish failed, stream=%s, stream_id=%d. ret=%d", stream.c_str(), stream_id, ret);
         return ret;
     }
+    srs_trace("publish stream %s", stream.c_str());
 
     return pthread->start();
 }

diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR       2
 #define VERSION_MINOR       0
-#define VERSION_REVISION    249
+#define VERSION_REVISION    250
 
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>