[Gnash-commit] /srv/bzr/gnash/trunk r12039: pass the rtmp handle to the handler

[Rob Savoye]

------------------------------------------------------------
revno: 12039
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sat 2010-03-13 17:29:46 -0700
message:
  pass the rtmp handle to the handler
modified:
  cygnal/cygnal.cpp

=== modified file 'cygnal/cygnal.cpp'
--- a/cygnal/cygnal.cpp 2010-02-09 21:15:33 +0000
+++ b/cygnal/cygnal.cpp 2010-03-14 00:29:46 +0000
@@ -1,6 +1,6 @@
 // cygnal.cpp:  GNU streaming Flash media server, for Gnash.
 // 
-//   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -898,6 +898,9 @@
        // Setup RTMP handler
        //
        if (args->protocol == Network::RTMP) {
+           Network::thread_params_t *rargs = new Network::thread_params_t;
+           rargs->protocol = args->protocol;
+           rargs->netfd = args->netfd;
            RTMPServer *rtmp = new RTMPServer;
            boost::shared_ptr<amf::Element> tcurl = 
                rtmp->processClientHandShake(args->netfd);
@@ -914,7 +917,7 @@
                            proto_str[args->protocol], key, args->netfd);
                hand.reset(new Handler);
                cyg.addHandler(key, hand);
-               // args->entry = rtmp;
+               rargs->entry = rtmp;
                hand->setNetConnection(rtmp->getNetConnection());
                std::vector<boost::shared_ptr<Cygnal::peer_t> >::iterator it;
                std::vector<boost::shared_ptr<Cygnal::peer_t> > active = 
cyg.getActive();
@@ -923,7 +926,7 @@
                    hand->addRemote(peer->fd);
                }
                hand->addClient(args->netfd, Network::RTMP);
-               args->handler = reinterpret_cast<void *>(hand.get());
+               rargs->handler = reinterpret_cast<void *>(hand.get());
                args->filespec = key;
                args->entry = rtmp;