Changeset 6485

Timestamp:

08/12/08 01:06:38 (3 months ago)

Author:

flynd

Message:

Put default MSN server address and port as constants in header and made it possible to override in configuration file.

Location:

trunk/msn/src

Files:

• msn-srv.cpp (modified) (1 diff)
• msn.cpp (modified) (3 diffs)
• msn.h (modified) (3 diffs)

trunk/msn/src/msn-srv.cpp

@@ -739 +739 @@
       pMSN->SetWaitingPingReply(false);
       pMSN->MSNLogoff();
-      pMSN->MSNLogon("messenger.hotmail.com", 1863);
+      pMSN->MSNLogon(pMSN->serverAddress().c_str(), pMSN->serverPort());
       pthread_mutex_unlock(&(pMSN->mutex_ServerSocket));
     }

trunk/msn/src/msn.cpp

@@ -96 +96 @@
     msnConf.LoadFile(szFileName);
   }  
-  
+
+  char tmpStr[MAX_LINE_LEN];
+
   msnConf.SetSection("network");
-  
   msnConf.ReadNum("ListVersion", m_nListVersion, 0);
-  
+  msnConf.ReadStr("MsnServerAddress", tmpStr, MSN_DEFAULT_SERVER_ADDRESS);
+  myServerAddress = tmpStr;
+  msnConf.ReadNum("MsnServerPort", myServerPort, MSN_DEFAULT_SERVER_PORT);
+
   msnConf.CloseFile();
 
@@ -461 +465 @@
             gSocketMan.DropSocket(sock);
             gSocketMan.CloseSocket(nSD);
-            MSNLogon("messenger.hotmail.com", 1863, m_nStatus);
+            MSNLogon(myServerAddress.c_str(), myServerPort, m_nStatus);
           }
         }
@@ -562 +566 @@
       {
         CLogonSignal *sig = static_cast<CLogonSignal *>(s);
-        MSNLogon("messenger.hotmail.com", 1863, sig->LogonStatus());
+        MSNLogon(myServerAddress.c_str(), myServerPort, sig->LogonStatus());
       }
       break;

trunk/msn/src/msn.h

@@ -47 +47 @@
 const unsigned short FLAG_BLOCK_LIST   = 4;
 const unsigned short FLAG_REVERSE_LIST = 8;
+
+const char MSN_DEFAULT_SERVER_ADDRESS[]         = "messenger.hotmail.com";
+const unsigned short MSN_DEFAULT_SERVER_PORT    = 1863;
 
 #ifndef HAVE_STRNDUP
@@ -96 +99 @@
   bool WaitingPingReply()          { return m_bWaitingPingReply; }
   void SetWaitingPingReply(bool b) { m_bWaitingPingReply = b; }
+
+  const std::string& serverAddress() const   { return myServerAddress; }
+  unsigned short serverPort() const     { return myServerPort; }
 
   pthread_mutex_t mutex_ServerSocket; // Ugly, but whatever.
@@ -153 +159 @@
   // Config
   unsigned long m_nListVersion;
-    
+  std::string myServerAddress;
+  unsigned short myServerPort;
+
   // Variables
   CICQDaemon *m_pDaemon;