[Libmsn-commits] rev 199 - branches/libmsn-3.1.x/msn

[<mr...@bl...>]

Author: mrowe
Date: 2004-06-25 15:57:11 +1200 (Fri, 25 Jun 2004)
New Revision: 199

Modified:
   branches/libmsn-3.1.x/msn/connection.cpp
   branches/libmsn-3.1.x/msn/filetransfer.cpp
   branches/libmsn-3.1.x/msn/notificationserver.cpp
   branches/libmsn-3.1.x/msn/switchboardserver.cpp
Log:
Merge [198] to 3.1.x branch.

Modified: branches/libmsn-3.1.x/msn/connection.cpp
===================================================================
--- branches/libmsn-3.1.x/msn/connection.cpp	2004-06-25 03:56:00 UTC (rev 198)
+++ branches/libmsn-3.1.x/msn/connection.cpp	2004-06-25 03:57:11 UTC (rev 199)
@@ -108,10 +108,12 @@
         }
     }
     
-    Connection::~Connection()
+    Connection::~Connection() {}
+    
+    void Connection::disconnect()
     {
         ext::unregisterSocket(this->sock);
-        close(this->sock);
+        ::close(this->sock);
     }
     
     std::vector<std::string> Connection::getLine()
@@ -129,9 +131,8 @@
     
     void Connection::errorOnSocket(int errno_)
     {
-        close(this->sock);
-        ext::showError(this, strerror(errno_));        
-        ext::closingConnection(this);
+        ext::showError(this, strerror(errno_));
+        this->disconnect();
     }
     
     void Connection::socketConnectionCompleted()

Modified: branches/libmsn-3.1.x/msn/filetransfer.cpp
===================================================================
--- branches/libmsn-3.1.x/msn/filetransfer.cpp	2004-06-25 03:56:00 UTC (rev 198)
+++ branches/libmsn-3.1.x/msn/filetransfer.cpp	2004-06-25 03:57:11 UTC (rev 199)
@@ -159,9 +159,7 @@
         this->auth.inv->switchboardConnection->removeFileTransferConnection(this);
         delete this->auth.inv;
         this->auth.inv = NULL;
-        if (this->sock != -1)
-            ::close(this->sock);
-        this->sock = -1;
+        Connection::disconnect();
     }
     
     FileTransferConnection::~FileTransferConnection()

Modified: branches/libmsn-3.1.x/msn/notificationserver.cpp
===================================================================
--- branches/libmsn-3.1.x/msn/notificationserver.cpp	2004-06-25 03:56:00 UTC (rev 198)
+++ branches/libmsn-3.1.x/msn/notificationserver.cpp	2004-06-25 03:57:11 UTC (rev 199)
@@ -510,8 +510,6 @@
     {
         assert(connectionStatus != NS_DISCONNECTED);
         ext::closingConnection(this);
-        ext::unregisterSocket(this->sock);
-        ::close(this->sock);
         
         std::list<SwitchboardServerConnection *> list = _switchboardConnections;
         std::list<SwitchboardServerConnection *>::iterator i = list.begin();
@@ -519,7 +517,7 @@
         {
             delete *i;
         }
-        
+        Connection::disconnect();
         connectionStatus = NS_DISCONNECTED;
     }
     
@@ -854,8 +852,8 @@
         if (ret == CURLE_OK)
             ret = curl_easy_setopt(curl, CURLOPT_URL, "https://login.passport.com/login2.srf");
         
-        uname = curl_escape(info->username.c_str(), 0);
-        pword = curl_escape(info->password.c_str(), 0);
+        uname = curl_escape(const_cast<char *>(info->username.c_str()), 0);
+        pword = curl_escape(const_cast<char *>(info->password.c_str()), 0);
         auth = std::string("Authorization: Passport1.4 OrgVerb=GET,OrgURL=http%3A%2F%2Fmessenger%2Emsn%2Ecom,sign-in=") + uname + ",pwd=" + pword + ","+ args[4];
         free(uname);
         free(pword);

Modified: branches/libmsn-3.1.x/msn/switchboardserver.cpp
===================================================================
--- branches/libmsn-3.1.x/msn/switchboardserver.cpp	2004-06-25 03:56:00 UTC (rev 198)
+++ branches/libmsn-3.1.x/msn/switchboardserver.cpp	2004-06-25 03:57:11 UTC (rev 199)
@@ -338,6 +338,7 @@
         {
             removeFileTransferConnection(*i);
         }
+        Connection::disconnect();
         connectionStatus = SB_DISCONNECTED;
     }