diff --git a/src/gui/server/guiserver.cpp b/src/gui/server/guiserver.cpp index f48ed8a6d79d41b72d9cc096697e9bfe1ecf8256..3ee29259dc71e44ce65330ade5630449cffe69ff 100644 --- a/src/gui/server/guiserver.cpp +++ b/src/gui/server/guiserver.cpp @@ -39,12 +39,27 @@ TCPSessionWriter::run() *this << _gui->popResponseMessage() << std::endl; } } + +std::string +Request::message(const std::string &code, const std::string &message) +{ + std::string returnMessage = code + " " + _sequenceId + " " + message; + return returnMessage; +} +std::string +RequestGlobal::execute(GUIServer* gui) +{ + std::string returnOK = std::string("200 ") + _sequenceId + " OK"; + return returnOK; +} + std::string -RequestCall::execute(GUIServer *gui) +RequestCall::execute(GUIServer* gui) { int serverCallId = gui->outgoingCall(_destination); if (serverCallId) { - return message("150", "Trying..."); + gui->pushResponseMessage(message("150", "Trying...")); + return message("200", "OK"); } else { return message("500","Server Error"); } diff --git a/src/gui/server/guiserver.h b/src/gui/server/guiserver.h index be2f36e77b71d06ed37448c0190b0612b8ac37ed..fd68dc98bdb7091a6c7094c277c47f15fb6e3181 100644 --- a/src/gui/server/guiserver.h +++ b/src/gui/server/guiserver.h @@ -34,12 +34,9 @@ class Request public: Request(const std::string &sequenceId, const std::string &arg) : _sequenceId(sequenceId), _arg(arg) {} virtual ~Request() {} - virtual std::string execute(GUIServer *gui) { return ""; } - virtual std::string message(const std::string &code, const std::string &message) - { - std::string returnMessage = code + " " + _sequenceId + " " + message; - return returnMessage; - } + virtual std::string execute(GUIServer* gui) { return ""; } + virtual std::string message(const std::string &code, const std::string &message); + protected: std::string _sequenceId; std::string _arg; @@ -60,11 +57,7 @@ public: } } virtual ~RequestGlobalCall() {} - virtual std::string execute(GUIServer *gui) - { - std::string returnOK = std::string("200 ") + _sequenceId + " OK"; - return returnOK; - } + protected: std::string _callid; }; @@ -117,11 +110,8 @@ class RequestGlobal : public Request public: RequestGlobal(const std::string &sequenceId, const std::string &arg) : Request(sequenceId,arg) {} virtual ~RequestGlobal() {} - virtual std::string execute(const GUIServer *gui) - { - std::string returnOK = std::string("200 ") + _sequenceId + " OK"; - return returnOK; - } + virtual std::string execute(GUIServer *gui); + }; class RequestMute : public RequestGlobal { @@ -144,7 +134,7 @@ class RequestSyntaxError : public Request public: RequestSyntaxError(const std::string &sequenceId, const std::string &arg) : Request(sequenceId, arg) {} ~RequestSyntaxError() {} - std::string execute() { + std::string execute(GUIServer *gui) { return message("501", "Syntax Error"); } };