libtransport.git Changeset - 0e01945c9839

Changeset - 0e01945c9839

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 13 years ago 2012-03-14 14:48:24
hanzz.k@gmail.com

Forward proper errors to XMPP user instead of Internal Server Error

2 files changed with 7 insertions and 6 deletions:

backends/skype/main.cpp

spectrum/src/sample.cfg

0 comments (0 inline, 0 general)

backends/skype/main.cpp

➞

Show inline comments

@@ @@ -363,7 +363,7 @@ bool Skype::createDBusProxy() { @@
 			if (m_counter == 15) {
 				LOG4CXX_ERROR(logger, "Logging out, proxy couldn't be created");
-				np->handleDisconnected(m_user, 0, error->message);
+				np->handleDisconnected(m_user, pbnetwork::CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE, error->message);
 				logout();
 				g_error_free(error);
 				return FALSE;
@@ @@ -393,7 +393,7 @@ static gboolean create_dbus_proxy(gpointer data) { @@
 void Skype::login() {
 	if (m_username.find("..") == 0 || m_username.find("/") != std::string::npos) {
-		np->handleDisconnected(m_user, 0, "Invalid username");
+		np->handleDisconnected(m_user, pbnetwork::CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE, "Invalid username");
 		return;
+	}
 	boost::filesystem::remove_all(std::string("/tmp/skype/") + m_username);
@@ @@ -493,7 +493,7 @@ bool Skype::loadSkypeBuddies() { @@
 		LOG4CXX_WARN(logger, "Skype wrote this on stdout '" << b << "'");
 		if (b.find("Incorrect Password") != std::string::npos) {
 			LOG4CXX_INFO(logger, "Incorrect password, logging out")
-			np->handleDisconnected(m_user, 0, "Incorrect password");
+			np->handleDisconnected(m_user, pbnetwork::CONNECTION_ERROR_AUTHENTICATION_FAILED, "Incorrect password");
 			close(fd_output);
 			logout();
 			return FALSE;
@@ @@ -503,7 +503,7 @@ bool Skype::loadSkypeBuddies() { @@
 	std::string re = send_command("NAME Spectrum");
 	if (m_counter++ > 15) {
 		LOG4CXX_ERROR(logger, "Logging out, because we tried to connect the Skype over DBUS 15 times without success");
-		np->handleDisconnected(m_user, 0, "");
+		np->handleDisconnected(m_user, pbnetwork::CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE, "Skype is not read.");
 		close(fd_output);
 		logout();
 		return FALSE;
@@ @@ -517,7 +517,7 @@ bool Skype::loadSkypeBuddies() { @@
 	if (send_command("PROTOCOL 7") != "PROTOCOL 7") {
 		LOG4CXX_ERROR(logger, "PROTOCOL 7 failed, logging out");
-		np->handleDisconnected(m_user, 0, "Skype is not ready");
+		np->handleDisconnected(m_user, pbnetwork::CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE, "Skype is not ready");
 		logout();
 		return FALSE;
+	}

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -13,11 +13,12 @@ admin_password=test @@
 #cert=server.pfx #patch to PKCS#12 certificate
 #cert_password=test #password to that certificate if any
 users_per_backend=10
 backend=/home/hanzz/code/libtransport/backends/libpurple/spectrum2_libpurple_backend
+#backend=/home/hanzz/code/libtransport/backends/libpurple/spectrum2_libpurple_backend
 #backend=/home/hanzz/code/libtransport/backends/smstools3/spectrum2_smstools3_backend
 #backend=/usr/bin/mono /home/hanzz/code/networkplugin-csharp/msnp-sharp-backend/bin/Debug/msnp-sharp-backend.exe
 #backend=/home/hanzz/code/libtransport/backends/frotz/spectrum2_frotz_backend
 #backend=/home/hanzz/code/libtransport/backends/libircclient-qt/spectrum2_libircclient-qt_backend
 backend=/usr/bin/xvfb-run -n BACKEND_ID -s "-screen 0 10x10x8" -f /tmp/x-skype-gw /home/hanzz/code/libtransport/backends/skype/spectrum2_skype_backend
 #protocol=prpl-msn
 protocol=any
 #protocol=prpl-icq

0 comments (0 inline, 0 general)