[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/rtmp r9935: for the echo tests, stay in th
From: |
rob |
Subject: |
[Gnash-commit] /srv/bzr/gnash/rtmp r9935: for the echo tests, stay in the handler as we're also in single threaded mode. |
Date: |
Tue, 30 Dec 2008 14:56:25 -0700 |
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 9935
committer: address@hidden
branch nick: rtmp
timestamp: Tue 2008-12-30 14:56:25 -0700
message:
for the echo tests, stay in the handler as we're also in single threaded mode.
modified:
libnet/rtmp_server.cpp
=== modified file 'libnet/rtmp_server.cpp'
--- a/libnet/rtmp_server.cpp 2008-12-30 21:08:34 +0000
+++ b/libnet/rtmp_server.cpp 2008-12-30 21:56:25 +0000
@@ -687,9 +687,9 @@
// Adjust the timeout
rtmp->setTimeout(10);
- boost::shared_ptr<amf::Buffer> pkt;
- boost::shared_ptr<amf::Element> tcurl;
- boost::shared_ptr<amf::Element> swfurl;
+ static boost::shared_ptr<amf::Buffer> pkt;
+ static boost::shared_ptr<amf::Element> tcurl;
+ static boost::shared_ptr<amf::Element> swfurl;
// This handler is called everytime there is RTMP data on a socket to
process the
// messsage. Unlike HTTP, RTMP always uses persistant network connections,
so we
@@ -746,7 +746,6 @@
log_error("Couldn't send Ping to client!");
}
- gnashSleep(10000);
// send a response to the NetConnection::connect() request
boost::shared_ptr<amf::Buffer> response =
rtmp->encodeResult(RTMPMsg::NC_CONNECT_SUCCESS);
if (rtmp->sendMsg(args->netfd, head->channel, RTMP::HEADER_12,
response->allocated(),
@@ -803,7 +802,6 @@
boost::shared_ptr<amf::Buffer> buf = rtmp->recvMsg(args->netfd);
if (buf) {
if (buf->allocated()) {
- done = true;
buf->dump();
boost::uint8_t *ptr = buf->reference();
if (ptr == 0) {
@@ -819,8 +817,10 @@
if (rtmp->sendMsg(args->netfd, rthead->channel,
RTMP::HEADER_8, result->allocated(),
RTMP::INVOKE, RTMPMsg::FROM_SERVER,
*result)) {
log_error("Sent echo test response response to
client.");
+ done = false;
} else {
log_error("Couldn't send echo test response to
client!");
+ done = true;
}
} else {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/rtmp r9935: for the echo tests, stay in the handler as we're also in single threaded mode.,
rob <=