[Gnash-commit] /srv/bzr/gnash/trunk r11495: merge from branch.

[Rob Savoye]

------------------------------------------------------------
revno: 11495 [merge]
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Tue 2009-09-08 21:12:29 -0600
message:
  merge from branch.
modified:
  cygnal/cygnal.cpp
  cygnal/handler.cpp
  cygnal/rtmp_server.cpp
  libnet/network.cpp
  libnet/rtmp.cpp

=== modified file 'cygnal/cygnal.cpp'
--- a/cygnal/cygnal.cpp 2009-09-07 21:56:47 +0000
+++ b/cygnal/cygnal.cpp 2009-09-09 03:00:53 +0000
@@ -900,7 +900,7 @@
                hand.reset(new Handler);
                cyg.addHandler(key, hand);
                args->entry = rtmp;
-               // hand->setNetConnection(rtmp->getNetConnection());
+               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();
                for (it = active.begin(); it < active.end(); ++it) {

=== modified file 'cygnal/handler.cpp'
--- a/cygnal/handler.cpp        2009-09-06 21:40:25 +0000
+++ b/cygnal/handler.cpp        2009-09-09 03:00:53 +0000
@@ -227,7 +227,7 @@
 int 
 Handler::createStream()
 {
-    GNASH_REPORT_FUNCTION;
+    // GNASH_REPORT_FUNCTION;
 
     return createStream("");
 }
@@ -235,7 +235,7 @@
 int
 Handler::createStream(const std::string &filespec)
 {
-    GNASH_REPORT_FUNCTION;
+    // GNASH_REPORT_FUNCTION;
 
     int streamid = _streams;
 

=== modified file 'cygnal/rtmp_server.cpp'
--- a/cygnal/rtmp_server.cpp    2009-09-07 02:21:08 +0000
+++ b/cygnal/rtmp_server.cpp    2009-09-09 03:00:53 +0000
@@ -1240,14 +1240,14 @@
                boost::shared_ptr<RTMP::rtmp_head_t> qhead;
                for (size_t i=0; i<que->size(); i++) {
                    boost::shared_ptr<amf::Buffer> bufptr = que->at(i)->pop();
-                       // que->at(i)->dump();
+                   // que->at(i)->dump();
                    if (bufptr) {
-                       bufptr->dump();
+                       // bufptr->dump();
                        qhead = rtmp->decodeHeader(bufptr->reference());
                        if (!qhead) {
                            return false;
                        }
-                       log_network("Message for channel #%d", qhead->channel);
+                       // log_network("Message for channel #%d", 
qhead->channel);
                        tmpptr = bufptr->reference() + qhead->head_size;
                        if (qhead->channel == RTMP_SYSTEM_CHANNEL) {
                            if (qhead->type == RTMP::USER) {
@@ -1264,7 +1264,7 @@
                                      log_unimpl("Stream No Data");
                                      break;
                                  case RTMP::STREAM_BUFFER:
-                                     log_unimpl("Stream Set Buffer");
+                                     log_unimpl("Stream Set Buffer: %d", 
user->param2);
                                      break;
                                  case RTMP::STREAM_LIVE:
                                      log_unimpl("Stream Live");
@@ -1410,8 +1410,15 @@
                      case RTMP::BYTES_READ:
                      case RTMP::ABORT:
                      case RTMP::USER:
+                         // already handled as this is a system channel message
+                         return true;
+                         break;
                      case RTMP::WINDOW_SIZE:
+                         log_unimpl("Set Window Size");
+                         break;
                      case RTMP::SET_BANDWITH:
+                         log_unimpl("Set Bandwidth");
+                         break;
                      case RTMP::ROUTE:
                      case RTMP::AUDIO_DATA:
                      case RTMP::VIDEO_DATA:

=== modified file 'libnet/network.cpp'
--- a/libnet/network.cpp        2009-09-07 02:28:48 +0000
+++ b/libnet/network.cpp        2009-09-09 02:59:37 +0000
@@ -1435,7 +1435,9 @@
        FD_ZERO(&fdset);
     }
 
-    log_network("select() saw activity on %d file descriptors.", ret);
+    if (ret) {
+       log_network("select() saw activity on %d file descriptors.", ret);
+    }
 
     return fdset;
 }

=== modified file 'libnet/rtmp.cpp'
--- a/libnet/rtmp.cpp   2009-09-07 17:34:36 +0000
+++ b/libnet/rtmp.cpp   2009-09-09 03:00:53 +0000
@@ -77,25 +77,26 @@
 const char *content_str[] = {
     "None",
     "Chunk Size",
-    "Unknown",
+    "Abort",
     "Bytes Read",
-    "Ping",
-    "Server",
-    "Client",
-    "Unknown2",
+    "User",
+    "Window Size",
+    "Set Bandwidth",
+    "Route",
     "Audio Data",
     "Video Data",
-    "Unknown3",
+    "Shared Object",
     "Blank 0xb",
     "Blank 0xc",
     "Blank 0xd",
     "Blank 0xe",
-    "Blank 0xf",
-    "Blank 0x10",
-    "Blank 0x11",
+    "AMF3 Notify",
+    "AMF3 Shared Object",
+    "AMF3_INVOKE",
     "Notify",
-    "Shared object",
+    "Blank 0x13",
     "Invoke",
+    "Blank 0x15",
     "FLV Data"
 };
 
@@ -336,15 +337,19 @@
         head->type = (content_types_e)byte;
        _type[head->channel] = head->type;
         tmpptr++;
-       // if (head->type <= RTMP::INVOKE ) {
-       //     log_network(_("The type is: %s"), content_str[head->type]);
-       // } else {
-       //     log_network(_("The type is: 0x%x"), head->type);
-       // }
+#if 0
+       if (head->type <= RTMP::INVOKE ) {
+           log_network(_("The type is: %s"), content_str[head->type]);
+       } else {
+           log_network(_("The type is: 0x%x"), head->type);
+       }
+#endif
     } else {
-       log_network("Using previous type of %d for channel %d",
-                   head->type, head->channel);
-       head->type = _type[head->channel];
+       if ((_type[head->channel] >= RTMP::NONE) && (_type[head->channel] <= 
RTMP::FLV_DATA)) {
+           log_network("Using previous type of %d for channel %d",
+                       head->type, head->channel);
+           head->type = _type[head->channel];
+       }
     }
 
     if (head->head_size == 12) {