external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

fix #122: edge forwarder(push to origin) assert failed, init client when connect to server. 0.9.167

Browse source
This commit is contained in:
winlin 2014-07-23 10:53:25 +08:00
parent b56e7ef7ab
commit 2e58fac5eb
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
trunk/src/app/srs_app_edge.cpp
View file

@ -311,7 +311,7 @@ int SrsEdgeIngester::connect_server()
kbps->set_io(io, io); 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); _source->can_publish(), _req->tcUrl.c_str(), _req->stream.c_str(), server.c_str(), port);
return ret; return ret;
@ -555,8 +555,17 @@ int SrsEdgeForwarder::connect_server()
return ret; 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. // 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); _req->stream.c_str(), _req->tcUrl.c_str(), server.c_str(), port);
return ret; return ret;

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "166" #define VERSION_REVISION "167"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"