[Gnash-commit] gnash ChangeLog server/asobj/xmlsocket.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/30 09:01:29

Modified files:
        .              : ChangeLog 
        server/asobj   : xmlsocket.cpp 

Log message:
                * server/asobj/xmlsocket.cpp: don't attempt to send
                  data when not connected !

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2727&r2=1.2728
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2727
retrieving revision 1.2728
diff -u -b -r1.2727 -r1.2728
--- ChangeLog   30 Mar 2007 08:31:04 -0000      1.2727
+++ ChangeLog   30 Mar 2007 09:01:28 -0000      1.2728
@@ -1,5 +1,7 @@
 2007-03-30 Sandro Santilli <address@hidden>
 
+       * server/asobj/xmlsocket.cpp: don't attempt to send
+         data when not connected !
        * testsuite/misc-ming.all/Makefile.am: prepared for
          activation of reverse_execute_PlaceObject2_test1runner
          (not activated as for Zou request).

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/asobj/xmlsocket.cpp  22 Mar 2007 22:37:46 -0000      1.13
+++ server/asobj/xmlsocket.cpp  30 Mar 2007 09:01:29 -0000      1.14
@@ -85,20 +85,25 @@
 XMLSocket::connect(const char *host, short port)
 {
     GNASH_REPORT_FUNCTION;
-    createClient(host, port);
-    _connect = true;
-    return true;
+    bool success = createClient(host, port);
+    _connect = success;
+
+    assert(!_sockfd || _connected);
+
+    return success;
 }
 
 void
 XMLSocket::close()
 {
     GNASH_REPORT_FUNCTION;
-    // Since the return code from close() doesn't get used by Shockwave,
-    // we don't care either.
-    if (_sockfd > 0) {
-        ::close(_sockfd);
-    }
+
+    closeNet();
+    // dunno why Network::closeNet() returns false always
+    // doesn't make much sense to me...
+    // Anyway, let's make sure we're clean
+    assert(!_sockfd);
+    assert(!_connected);
 }
 
 // Return true if there is data in the socket, otherwise return false.
@@ -263,10 +268,17 @@
 {
     //GNASH_REPORT_FUNCTION;
     
+    if ( ! _connect )
+    {
+       assert(!_sockfd);
+        log_warning("socket not initialized at XMLSocket.send() call time");
+       return false;
+    }
+    
     str += '\0';
     int ret = write(_sockfd, str.c_str(), str.size());
     
-    //log_msg("%s: sent %d bytes, data was %s\n", __FUNCTION__, ret, 
str.c_str());
+    log_msg("%s: sent %d bytes, data was %s\n", __FUNCTION__, ret, 
str.c_str());
     if (ret == static_cast<signed int>(str.size())) {
         return true;
     } else {