diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp index 2fb0efa93..25452b6e3 100644 --- a/trunk/src/app/srs_app_edge.cpp +++ b/trunk/src/app/srs_app_edge.cpp @@ -311,7 +311,7 @@ int SrsEdgeIngester::connect_server() kbps->set_io(io, io); - srs_trace("edge connected, can_publish=%d, url=%s/%s, server=%s:%d", + srs_trace("edge pull connected, can_publish=%d, url=%s/%s, server=%s:%d", _source->can_publish(), _req->tcUrl.c_str(), _req->stream.c_str(), server.c_str(), port); return ret; @@ -555,8 +555,17 @@ int SrsEdgeForwarder::connect_server() return ret; } + srs_freep(client); + srs_freep(io); + + srs_assert(stfd); + io = new SrsSocket(stfd); + client = new SrsRtmpClient(io); + + kbps->set_io(io, io); + // open socket. - srs_trace("connect edge stream=%s, tcUrl=%s to server=%s, port=%d", + srs_trace("edge push connected, stream=%s, tcUrl=%s to server=%s, port=%d", _req->stream.c_str(), _req->tcUrl.c_str(), server.c_str(), port); return ret; diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index f869a1784..57fe7bf1e 100644 --- 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 "0" #define VERSION_MINOR "9" -#define VERSION_REVISION "166" +#define VERSION_REVISION "167" #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION // server info. #define RTMP_SIG_SRS_KEY "SRS"