From 153ca1814d3a15dccb782b3299fb1774a693dff4 Mon Sep 17 00:00:00 2001
From: yanmorin <yanmorin>
Date: Fri, 16 Sep 2005 21:22:04 +0000
Subject: [PATCH] Receive events for other than call
---
src/gui/server/guiserver.cpp | 19 +++++++++++++++++--
src/gui/server/guiserver.h | 24 +++++++-----------------
2 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/gui/server/guiserver.cpp b/src/gui/server/guiserver.cpp
index f48ed8a6d7..3ee29259dc 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 be2f36e77b..fd68dc98bd 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");
}
};
--
GitLab