From: <mr...@bl...> - 2004-06-23 15:32:37
|
Author: mrowe Date: 2004-06-24 03:32:33 +1200 (Thu, 24 Jun 2004) New Revision: 190 Modified: branches/libmsn-3.1.x/msn/filetransfer.cpp branches/libmsn-3.1.x/msn/filetransfer.h branches/libmsn-3.1.x/msn/invitation.h branches/libmsn-3.1.x/msn/message.h branches/libmsn-3.1.x/msn/notificationserver.h branches/libmsn-3.1.x/msn/switchboardserver.cpp branches/libmsn-3.1.x/msn/switchboardserver.h branches/libmsn-3.1.x/msn/util.cpp branches/libmsn-3.1.x/msn/util.h Log: Merge [188] to 3.1.x branch. Modified: branches/libmsn-3.1.x/msn/filetransfer.cpp =================================================================== --- branches/libmsn-3.1.x/msn/filetransfer.cpp 2004-06-23 15:26:30 UTC (rev 189) +++ branches/libmsn-3.1.x/msn/filetransfer.cpp 2004-06-23 15:32:33 UTC (rev 190) @@ -40,7 +40,7 @@ { const unsigned int MAX_FTP_BLOCK_SIZE = 20000; - void FileTransferInvitation::invitationWasAccepted(std::string & body) + void FileTransferInvitation::invitationWasAccepted(const std::string & body) { if (this->invitationWasSent()) { @@ -52,7 +52,7 @@ } } - void FileTransferInvitation::invitationWasCanceled(std::string & body) + void FileTransferInvitation::invitationWasCanceled(const std::string & body) { ext::fileTransferFailed(this, 0, "Cancelled by remote user"); if (this->invitationWasSent()) @@ -66,7 +66,7 @@ this->switchboardConnection->removeFileTransferConnection(this); } - void FileTransferInvitation::sendFile(std::string & msg_body) + void FileTransferInvitation::sendFile(const std::string & msg_body) { int port = 6891; char tmp[64]; @@ -109,7 +109,7 @@ delete msg; } - void FileTransferInvitation::receiveFile(std::string & msg_body) + void FileTransferInvitation::receiveFile(const std::string & msg_body) { Message::Headers headers = Message::Headers(msg_body); std::string cookie = headers["AuthCookie"]; @@ -491,7 +491,7 @@ this->switchboardConnection->invitationsReceived.remove(this); } - void FileTransferInvitation::acceptTransfer(const std::string dest) + void FileTransferInvitation::acceptTransfer(const std::string & dest) { std::ostringstream buf_; buf_ << "Invitation-Command: ACCEPT\r\n"; Modified: branches/libmsn-3.1.x/msn/filetransfer.h =================================================================== --- branches/libmsn-3.1.x/msn/filetransfer.h 2004-06-23 15:26:30 UTC (rev 189) +++ branches/libmsn-3.1.x/msn/filetransfer.h 2004-06-23 15:32:33 UTC (rev 190) @@ -64,11 +64,11 @@ /** The remote side accepted our file transfer. Notify calling code. */ - virtual void invitationWasAccepted(std::string & body); + virtual void invitationWasAccepted(const std::string & body); /** The remote side canceled our file transfer. Notify calling code. */ - virtual void invitationWasCanceled(std::string & body); + virtual void invitationWasCanceled(const std::string & body); /** The user wishes to accept the file transfer, and have the file * written to @a destinationFile. @@ -77,7 +77,7 @@ * in the file? This would remove some of the complexity in the * file transfer code. */ - void acceptTransfer(const std::string destinationFile); + void acceptTransfer(const std::string & destinationFile); /** The user wishes to decline the file transfer. */ @@ -87,8 +87,8 @@ */ void cancelTransfer(); private: - void sendFile(std::string & msg_body); - void receiveFile(std::string & msg_body); + void sendFile(const std::string & msg_body); + void receiveFile(const std::string & msg_body); }; Modified: branches/libmsn-3.1.x/msn/invitation.h =================================================================== --- branches/libmsn-3.1.x/msn/invitation.h 2004-06-23 15:26:30 UTC (rev 189) +++ branches/libmsn-3.1.x/msn/invitation.h 2004-06-23 15:32:33 UTC (rev 190) @@ -44,14 +44,14 @@ Passport otherUser; SwitchboardServerConnection *switchboardConnection; - Invitation(ApplicationType application_, std::string cookie_, + Invitation(ApplicationType application_, const std::string & cookie_, Passport otherUser_, SwitchboardServerConnection * switchboardConnection_) : application(application_), cookie(cookie_), otherUser(otherUser_), switchboardConnection(switchboardConnection_) {}; virtual ~Invitation() {}; - virtual void invitationWasAccepted(std::string & body) = 0; - virtual void invitationWasCanceled(std::string & body) = 0; + virtual void invitationWasAccepted(const std::string & body) = 0; + virtual void invitationWasCanceled(const std::string & body) = 0; bool invitationWasSent(); }; Modified: branches/libmsn-3.1.x/msn/message.h =================================================================== --- branches/libmsn-3.1.x/msn/message.h 2004-06-23 15:26:30 UTC (rev 189) +++ branches/libmsn-3.1.x/msn/message.h 2004-06-23 15:32:33 UTC (rev 190) @@ -92,7 +92,7 @@ class Headers { public: - Headers(std::string & rawContents_) : rawContents(rawContents_) {}; + Headers(const std::string & rawContents_) : rawContents(rawContents_) {}; Headers() : rawContents("") {}; std::string asString() const; std::string operator[](const std::string header) const; Modified: branches/libmsn-3.1.x/msn/notificationserver.h =================================================================== --- branches/libmsn-3.1.x/msn/notificationserver.h 2004-06-23 15:26:30 UTC (rev 189) +++ branches/libmsn-3.1.x/msn/notificationserver.h 2004-06-23 15:32:33 UTC (rev 190) @@ -124,7 +124,7 @@ std::string password; std::string cookie; - connectinfo(Passport & username_, std::string & password_) : username(username_), password(password_), cookie("") {}; + connectinfo(const Passport & username_, const std::string & password_) : username(username_), password(password_), cookie("") {}; }; /** Represents a connection to a MSN notification server. @@ -143,8 +143,8 @@ public: std::string password; - AuthData(Passport & passport_, - std::string & password_) : + AuthData(const Passport & passport_, + const std::string & password_) : ::MSN::AuthData(passport_), password(password_) {} ; }; Modified: branches/libmsn-3.1.x/msn/switchboardserver.cpp =================================================================== --- branches/libmsn-3.1.x/msn/switchboardserver.cpp 2004-06-23 15:26:30 UTC (rev 189) +++ branches/libmsn-3.1.x/msn/switchboardserver.cpp 2004-06-23 15:32:33 UTC (rev 190) @@ -101,7 +101,7 @@ bool operator()(const _Tp &__x) { return __x->cookie == cookie; } }; - Invitation *SwitchboardServerConnection::invitationWithCookie(std::string & cookie) + Invitation *SwitchboardServerConnection::invitationWithCookie(const std::string & cookie) { std::list<Invitation *> & receivedList = this->invitationsReceived; std::list<Invitation *> & sentList = this->invitationsSent; @@ -165,7 +165,7 @@ this->sendMessage(&msg); } - void SwitchboardServerConnection::handleInvite(Passport from, std::string friendly, std::string mime, std::string body) + void SwitchboardServerConnection::handleInvite(Passport from, const std::string & friendly, const std::string & mime, const std::string & body) { assert(connectionStatus >= SB_READY); Message::Headers headers = Message::Headers(body); @@ -195,7 +195,7 @@ } } - void SwitchboardServerConnection::handleNewInvite(Passport & from, std::string & friendly, std::string & mime, std::string & body) + void SwitchboardServerConnection::handleNewInvite(Passport & from, const std::string & friendly, const std::string & mime, const std::string & body) { assert(connectionStatus >= SB_READY); Message::Headers headers = Message::Headers(body); Modified: branches/libmsn-3.1.x/msn/switchboardserver.h =================================================================== --- branches/libmsn-3.1.x/msn/switchboardserver.h 2004-06-23 15:26:30 UTC (rev 189) +++ branches/libmsn-3.1.x/msn/switchboardserver.h 2004-06-23 15:32:33 UTC (rev 190) @@ -50,8 +50,8 @@ std::string cookie; const void *tag; - AuthData(Passport & username_, std::string & sessionID_, - std::string & cookie_, const void *tag_=NULL) : + AuthData(Passport & username_, const std::string & sessionID_, + const std::string & cookie_, const void *tag_=NULL) : ::MSN::AuthData(username_), sessionID(sessionID_), cookie(cookie_), tag(tag_) {}; AuthData(Passport & username_, const void *tag_=NULL) : @@ -128,7 +128,7 @@ */ virtual void removeCallback(int trid); - Invitation *invitationWithCookie(std::string & cookie); + Invitation *invitationWithCookie(const std::string & cookie); virtual void socketConnectionCompleted(); protected: @@ -155,8 +155,8 @@ void callback_InviteUsers(std::vector<std::string> & args, int trid, void * data); void callback_AnsweredCall(std::vector<std::string> & args, int trid, void * data); - void handleInvite(Passport from, std::string friendly, std::string mime, std::string body); - void handleNewInvite(Passport & from, std::string & friendly, std::string & mime, std::string & body); + void handleInvite(Passport from, const std::string & friendly, const std::string & mime, const std::string & body); + void handleNewInvite(Passport & from, const std::string & friendly, const std::string & mime, const std::string & body); friend class Connection; }; } Modified: branches/libmsn-3.1.x/msn/util.cpp =================================================================== --- branches/libmsn-3.1.x/msn/util.cpp 2004-06-23 15:26:30 UTC (rev 189) +++ branches/libmsn-3.1.x/msn/util.cpp 2004-06-23 15:32:33 UTC (rev 190) @@ -26,28 +26,29 @@ namespace MSN { - std::pair<std::string, int> splitServerAddress(std::string & address, int default_port) + std::pair<std::string, int> splitServerAddress(const std::string & address, int default_port) { size_t pos; + std::string host = address; int port = default_port; if ((pos = address.find(":")) != std::string::npos) { std::string port_s = address.substr(pos + 1); - address = address.substr(0, pos); + host = address.substr(0, pos); port = decimalFromString(port_s); } - if (address == "" || port < 0) + if (host == "" || port < 0) throw std::runtime_error("Invalid zero-length address or negative port number!"); - return std::make_pair(address, port); + return std::make_pair(host, port); } - std::string decodeURL(std::string s) + std::string decodeURL(const std::string & s) { std::string out; - std::string::iterator i; + std::string::const_iterator i; for (i = s.begin(); i != s.end(); i++) { @@ -63,10 +64,10 @@ return out; } - std::string encodeURL(std::string s) + std::string encodeURL(const std::string & s) { std::string out; - std::string::iterator i; + std::string::const_iterator i; for (i = s.begin(); i != s.end(); i++) { @@ -86,7 +87,7 @@ return out; } - std::vector<std::string> splitString(std::string s, std::string sep, bool suppressBlanks) + std::vector<std::string> splitString(const std::string & s, const std::string & sep, bool suppressBlanks) { std::vector<std::string> array; size_t position, last_position; @@ -124,7 +125,7 @@ return (int) (size1 - size2); } - unsigned int decimalFromString(std::string s) throw (std::logic_error) + unsigned int decimalFromString(const std::string & s) throw (std::logic_error) { unsigned int result = strtol(s.c_str(), NULL, 10); errno = 0; Modified: branches/libmsn-3.1.x/msn/util.h =================================================================== --- branches/libmsn-3.1.x/msn/util.h 2004-06-23 15:26:30 UTC (rev 189) +++ branches/libmsn-3.1.x/msn/util.h 2004-06-23 15:32:33 UTC (rev 190) @@ -36,7 +36,7 @@ * @return A string with all non-alphanumeric characters replaced by their * URL-encoded equivalent. */ - std::string encodeURL(std::string s); + std::string encodeURL(const std::string & s); /** URL-decode a string * @@ -44,7 +44,7 @@ * @return A string with all URL-encoded sequences replaced by their * @c ASCII equivalent. */ - std::string decodeURL(std::string s); + std::string decodeURL(const std::string & s); /** Split a string containing a hostname and port number into its respective parts. * @@ -52,18 +52,18 @@ * @param default_port A port number to return in the event that ":port" is omitted from @a address. * @return A pair containing the hostname and port number. */ - std::pair<std::string, int> splitServerAddress(std::string & address, int default_port=1863); + std::pair<std::string, int> splitServerAddress(const std::string & address, int default_port=1863); /** Compare two strings in a case insensitive fashion */ - int nocase_cmp(const std::string & s1, const std::string& s2); + int nocase_cmp(const std::string & s1, const std::string & s2); /** Split @a string at each occurence of @a separator. */ - std::vector<std::string> splitString(std::string string, std::string separator, bool suppressBlanks=true); + std::vector<std::string> splitString(const std::string & string, const std::string & separator, bool suppressBlanks=true); /** Convert a string, @a s, that contains decimal digits into an unsigned int. */ - unsigned int decimalFromString(std::string s) throw (std::logic_error); + unsigned int decimalFromString(const std::string & s) throw (std::logic_error); } #endif |