[Gnash-commit] /srv/bzr/gnash/rtmp r9933: minor change to error handling return codes.

[rob]

------------------------------------------------------------
revno: 9933
committer: address@hidden
branch nick: rtmp
timestamp: Tue 2008-12-30 14:07:49 -0700
message:
  minor change to error handling return codes.
modified:
  libnet/rtmp.cpp

=== modified file 'libnet/rtmp.cpp'
--- a/libnet/rtmp.cpp   2008-12-28 22:36:56 +0000
+++ b/libnet/rtmp.cpp   2008-12-30 21:07:49 +0000
@@ -25,6 +25,7 @@
 #include <string>
 #include <map>
 #include <vector>
+#include <cerrno>
 #include <boost/detail/endian.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/format.hpp>
@@ -843,6 +844,10 @@
     // First send the full header, afterwards we only use continuation
     // headers, which are only one byte.
     ret = writeNet(fd, head->reference(), head->size());
+    if (ret == -1) {
+       log_error("Couldn't write the RTMP header!");
+       return false;
+    }    
 
     // now send the data
     while (nbytes <= data.allocated()) {
@@ -858,6 +863,10 @@
        }
        // write the data to the client
        ret = writeNet(fd, data.reference() + nbytes, partial);
+       if (ret == -1) {
+           log_error("Couldn't write the RTMP body!");
+           return false;
+       }
        // adjust the accumulator.
        nbytes += _chunksize[channel];
     };
@@ -1056,14 +1065,11 @@
            log_debug("Got an empty packet from the server at line %d", 
__LINE__);
            continue;
        }
-       if (ret < 0) {
-           log_error("Never got any data at line %d", __LINE__);
-           break;
-       }
        // ret is "no position" when the socket is closed from the other end of 
the connection,
        // so we're done.
        if ((ret == static_cast<int>(string::npos)) || (ret == -1)) {
            log_debug("socket for fd #%d was closed...", fd);
+           buf.reset();
            break;
        }
     } while (ret);