libtransport.git Changeset - 8a66baabcb99

Changeset - 8a66baabcb99

Parent rev.

Child rev.

[Not reviewed]

1 2 1

Jan Kaluza - 13 years ago 2012-06-20 11:49:00
hanzz.k@gmail.com

DiscoItemsResponder can add adhoc commands

3 files changed with 30 insertions and 9 deletions:

include/transport/discoitemsresponder.h

src/discoitemsresponder.cpp

src/transport.cpp

0 comments (0 inline, 0 general)

include/transport/discoitemsresponder.h

➞

Show inline comments

@@ @@ -27,14 +27,22 @@ @@
 namespace Transport {
 class Component;
 class DiscoItemsResponder : public Swift::GetResponder<Swift::DiscoItems> {
 	public:
-		DiscoItemsResponder(Swift::IQRouter *router);
+		DiscoItemsResponder(Component *component);
 		~DiscoItemsResponder();
 		void addAdHocCommand(const std::string &node, const std::string &name);
 // 		void removeAdHocCommand(const std::string &node);
 	private:
 		virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::DiscoItems> payload);
 		Component *m_component;
 		boost::shared_ptr<Swift::DiscoItems> m_commands;
 };
+}
@@ \ No newline at end of file @@

src/discoitemsresponder.cpp

➞

Show inline comments

@@ @@ -18,32 +18,45 @@ @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "discoitemsresponder.h"
+#include "transport/discoitemsresponder.h"
 #include <iostream>
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Elements/DiscoItems.h"
 #include "Swiften/Swiften.h"
 #include "transport/transport.h"
 #include "transport/logging.h"
 using namespace Swift;
 using namespace boost;
 namespace Transport {
 DiscoItemsResponder::DiscoItemsResponder(Swift::IQRouter *router) : Swift::GetResponder<DiscoItems>(router) {
 DEFINE_LOGGER(logger, "DiscoItemsResponder");
 DiscoItemsResponder::DiscoItemsResponder(Component *component) : Swift::GetResponder<DiscoItems>(component->getIQRouter()) {
 	m_component = component;
 	m_commands = boost::shared_ptr<DiscoItems>(new DiscoItems());
 	m_commands->setNode("http://jabber.org/protocol/commands");
+}
 DiscoItemsResponder::~DiscoItemsResponder() {
+}
 void DiscoItemsResponder::addAdHocCommand(const std::string &node, const std::string &name) {
 	m_commands->addItem(DiscoItems::Item(name, m_component->getJID(), node));
+}
 bool DiscoItemsResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::DiscoItems> info) {
 	// presence for transport
 	if (to.getNode().empty()) {
 	LOG4CXX_INFO(logger, "get request received with node " << info->getNode());
 	if (info->getNode() == "http://jabber.org/protocol/commands") {
 		sendResponse(from, id, m_commands);
+	}
 	else if (to.getNode().empty()) {
 		sendResponse(from, id, boost::shared_ptr<DiscoItems>(new DiscoItems()));
+	}
 	// presence for buddy
 	else {
 		sendResponse(from, id, boost::shared_ptr<DiscoItems>(new DiscoItems()));
+	}

src/transport.cpp

➞

Show inline comments

@@ @@ -26,7 +26,7 @@ @@
 #include "transport/userregistry.h"
 #include "transport/logging.h"
 #include "discoinforesponder.h"
 #include "discoitemsresponder.h"
+#include "transport/discoitemsresponder.h"
 #include "storageparser.h"
 #include "Swiften/TLS/OpenSSL/OpenSSLServerContext.h"
 #include "Swiften/TLS/PKCS12Certificate.h"
 	m_discoInfoResponder = new DiscoInfoResponder(m_iqRouter, m_config);
 	m_discoInfoResponder->start();
-	m_discoItemsResponder = new DiscoItemsResponder(m_iqRouter);
+	m_discoItemsResponder = new DiscoItemsResponder(this);
 	m_discoItemsResponder->start();
 //

0 comments (0 inline, 0 general)