gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] /srv/bzr/gnash/rtmp r9917: decode the msg body from the r


From: rob
Subject: [Gnash-commit] /srv/bzr/gnash/rtmp r9917: decode the msg body from the right offset
Date: Sat, 27 Dec 2008 19:43:55 -0700
User-agent: Bazaar (1.5)

------------------------------------------------------------
revno: 9917
committer: address@hidden
branch nick: rtmp
timestamp: Sat 2008-12-27 19:43:55 -0700
message:
  decode the msg body from the right offset
modified:
  libnet/rtmp_server.cpp
=== modified file 'libnet/rtmp_server.cpp'
--- a/libnet/rtmp_server.cpp    2008-12-28 01:48:41 +0000
+++ b/libnet/rtmp_server.cpp    2008-12-28 02:43:55 +0000
@@ -151,7 +151,7 @@
     }
 
     // Copy the extra data from the end of the handshake to the new buffer. 
Normally we
-    // try to avoiud copying anything around, but as this is only used once 
for each connection,
+    // try to avoid copying anything around, but as this is only used once for 
each connection,
     // there isn't a real performance hit from it.
     if (handshake2.allocated() >= static_cast<size_t>(RTMP_HANDSHAKE_SIZE)) {
        log_debug("Got extra data in handshake, %d bytes for fd #%d",
@@ -544,10 +544,8 @@
     }
     boost::shared_ptr<amf::Buffer> start = rtmp->serverFinish(args->netfd, 
*handshake1, *handshake2);
 
-    start->dump();
-    
     boost::shared_ptr<RTMP::rtmp_head_t> head = rtmp->decodeHeader(*start);
-    rtmp->decodeMsgBody(*start);
+    rtmp->decodeMsgBody(start->reference() + head->head_size, head->bodysize);
     
     // Keep track of the network statistics
 //    Statistics st;


reply via email to

[Prev in Thread] Current Thread [Next in Thread]