[Gnash-commit] /srv/bzr/gnash/trunk r12004: don't use libnet anywhere.

[Rob Savoye]

------------------------------------------------------------
revno: 12004
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Tue 2010-03-09 14:22:09 -0700
message:
  don't use libnet anywhere.
modified:
  libcore/asobj/flash/net/XMLSocket_as.cpp

=== modified file 'libcore/asobj/flash/net/XMLSocket_as.cpp'
--- a/libcore/asobj/flash/net/XMLSocket_as.cpp  2010-03-09 20:11:52 +0000
+++ b/libcore/asobj/flash/net/XMLSocket_as.cpp  2010-03-09 21:22:09 +0000
@@ -98,8 +98,7 @@
 
     size_t writeMessage(const std::string& str) {
         // We have to write the null terminator as well.
-       return 0;               // TODO
-//        return write(_socket.getFileFd(), str.c_str(), str.size() + 1);
+        return write(_socket.connected(), str.c_str(), str.size() + 1);
     }
 
     /// Read from the socket.
@@ -107,7 +106,7 @@
         
         assert(_socket.connected());
     
-        const int fd = 0; //_socket.getFileFd(); TODO
+        const int fd = _socket.connected();
         assert(fd > 0);
 
         fd_set fdset;
@@ -192,19 +191,22 @@
         if (_start) {
            _start.reset();
        }
-      // _socket.closeNet(); TODO:
+       _socket.close();
         
         // Reset for next connection.
         _complete = false;
 
-        // assert(_socket.getFileFd() <= 0); TODO
         assert(!_socket.connected());
     }
 
 private:
 
     void makeConnection(const std::string& host, boost::uint16_t port) {
-        // _socket.createClient(host, port); TODO
+       std::string combined = host;
+       combined += ":";
+       combined += port;       
+       URL url(combined);
+        _socket.connect(url);
         _complete = true;
     }