From dc6619e540e17c6fd3224653f7c45a3effe99e38 Mon Sep 17 00:00:00 2001
From: hubin <hubin@3mang.com>
Date: Tue, 23 May 2017 08:19:26 +0800
Subject: [PATCH] ver:2.0+ r3532 a0bf6138 2017-05-23 07:49:25 add forward_peer,to support forward between origins.the streams pushed from peer origins will not be forward any more. remove forward_server_srs,which used to indicate the forward target server is or is not srs, add forward_server_other, to list the target rtmp server other than srs in.
---
conf/forward.master.conf | 7 +++++--
objs/srs | Bin 16024075 -> 0 bytes
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/conf/forward.master.conf b/conf/forward.master.conf
index 7a718da..3558455 100644
--- a/conf/forward.master.conf
+++ b/conf/forward.master.conf
@@ -11,6 +11,9 @@ vhost __defaultVhost__ {
forward 127.0.0.1:19350;
#select on of the listed servers in turn to forward,not all of them
forward_in_turn 127.0.0.1:19351 127.0.0.1:19352;
-#the forward destination server type,default true. if the server is not srs server,connect app maybe fail,try config as false
- forward_server_srs true;
+#if the forward destination server is not srs,such as some rtmp server in cdn,write the address of them below
+ forward_server_other 127.0.0.1:19350;
+#if the forward server is same as this server , a origin,try use forward_peer,
+#the stream pushed from other forward peer will not forward any more in this server
+ forward_peer 127.0.0.1:1936;
}
diff --git a/objs/srs b/objs/srs
index 5bc31ae..642e38e 100755
Binary files a/objs/srs and b/objs/srs differ
--
libgit2 0.24.0