From 800fd1f696ade4e573285ed15e3c143449b57704 Mon Sep 17 00:00:00 2001
From: PerryWerneck <perry.werneck@gmail.com>
Date: Thu, 2 Mar 2017 21:08:06 -0300
Subject: [PATCH] Incluindo suporte para serviço pw3270 via D-Bus.

---
 pw3270.cbp                      |  52 ----------------------------------------------------
 src/libpw3270cpp/Makefile.in    |  10 ++++++----
 src/libpw3270cpp/classlib.cbp   |   3 ++-
 src/libpw3270cpp/private.h      |   5 +++++
 src/libpw3270cpp/remote.cc      |  15 ++++++++++++++-
 src/libpw3270cpp/service.cc     | 409 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/libpw3270cpp/testprogram.cc |  10 +++++++++-
 7 files changed, 445 insertions(+), 59 deletions(-)
 create mode 100644 src/libpw3270cpp/service.cc

diff --git a/pw3270.cbp b/pw3270.cbp
index 68d8b4e..83ef6ba 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -99,58 +99,10 @@
 			<Option target="Debug" />
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src/java/actions.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/call.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/clipboard.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/connect.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/cursor.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/dialog.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/field.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/getset.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/info.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
 		<Unit filename="src/java/jni3270.h">
 			<Option target="Debug" />
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src/java/keyboard.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/main.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/plugin.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
 		<Unit filename="src/java/private.h">
 			<Option target="Debug" />
 			<Option target="Release" />
@@ -167,10 +119,6 @@
 			<Option target="Debug" />
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src/java/startstop.cc">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
 		<Unit filename="src/java/terminal.java">
 			<Option target="Debug" />
 			<Option target="Release" />
diff --git a/src/libpw3270cpp/Makefile.in b/src/libpw3270cpp/Makefile.in
index 73fef30..2c46451 100644
--- a/src/libpw3270cpp/Makefile.in
+++ b/src/libpw3270cpp/Makefile.in
@@ -26,7 +26,7 @@
 
 MODULE_NAME=libpw3270cpp
 
-SOURCES=session.cc exception.cc local.cc remote.cc module.cc
+SOURCES=session.cc exception.cc local.cc remote.cc service.cc module.cc
 
 #---[ Configuration values ]-------------------------------------------------------------
 
@@ -148,7 +148,7 @@ $(SRCDIR): \
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
-	$(BASEDIR)/.obj/Debug/$(MODULE_NAME).a
+	.bin/Debug/$(MODULE_NAME)@EXEEXT@
 
 $(BASEDIR)/.obj/Debug/$(MODULE_NAME).a: \
 	$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
@@ -157,14 +157,15 @@ $(BASEDIR)/.obj/Debug/$(MODULE_NAME).a: \
 	@$(MKDIR) `dirname $@`
 	@$(AR) rcs $@ $^
 
-$(BASEDIR)/.obj/Debug/$(MODULE_NAME)@EXEEXT@: \
+.bin/Debug/$(MODULE_NAME)@EXEEXT@: \
 	$(OBJDBG)/testprogram.o \
 	$(BASEDIR)/.obj/Debug/$(MODULE_NAME).a
 
+	@$(MKDIR) `dirname $@`
 	@$(LD) $(APP_LDFLAGS) -o $@ $^ $(LIBS)
 
 run: \
-	$(BASEDIR)/.obj/Debug/$(MODULE_NAME)@EXEEXT@
+	.bin/Debug/$(MODULE_NAME)@EXEEXT@
 
 ifeq ($(VALGRIND),no)
 	$(BASEDIR)/.obj/Debug/$(MODULE_NAME)@EXEEXT@
@@ -185,6 +186,7 @@ cleanDebug:
 
 	@rm -fr	$(BASEDIR)/.obj/Debug/$(MODULE_NAME).a \
 			$(OBJDBG)
+	@rm -fr .bin
 
 cleanRelease:
 
diff --git a/src/libpw3270cpp/classlib.cbp b/src/libpw3270cpp/classlib.cbp
index ccb1dab..7e15197 100644
--- a/src/libpw3270cpp/classlib.cbp
+++ b/src/libpw3270cpp/classlib.cbp
@@ -8,7 +8,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin/Debug/testprogram" prefix_auto="1" extension_auto="1" />
+				<Option output=".bin/Debug/libpw3270cpp" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -40,6 +40,7 @@
 		<Unit filename="module.cc" />
 		<Unit filename="private.h" />
 		<Unit filename="remote.cc" />
+		<Unit filename="service.cc" />
 		<Unit filename="session.cc" />
 		<Unit filename="testprogram.cc" />
 		<Extensions>
diff --git a/src/libpw3270cpp/private.h b/src/libpw3270cpp/private.h
index 00e8220..203345b 100644
--- a/src/libpw3270cpp/private.h
+++ b/src/libpw3270cpp/private.h
@@ -107,7 +107,12 @@
 
 	#endif // !c11
 
+	 namespace PW3270_NAMESPACE
+	 {
 
+		session	* create_service_client(const char *session) throw (std::exception);
+
+	 }
 
 
 #endif // PRIVATE_H_INCLUDED
diff --git a/src/libpw3270cpp/remote.cc b/src/libpw3270cpp/remote.cc
index 24d214c..a4cfd82 100644
--- a/src/libpw3270cpp/remote.cc
+++ b/src/libpw3270cpp/remote.cc
@@ -77,6 +77,8 @@
  #include <pw3270cpp.h>
  #include <lib3270/log.h>
 
+ #include "private.h"
+
 #if defined(HAVE_DBUS)
  static const char	* prefix_dest	= "br.com.bb.";
  static const char	* prefix_path	= "/br/com/bb/";
@@ -1617,7 +1619,18 @@
 
 	session	* session::create_remote(const char *session) throw (std::exception)
 	{
-		return new remote(session);
+		debug("create(%s)",session);
+
+		if(strncasecmp(session,"service://",10)) {
+			return new remote(session);
+		}
+
+#ifdef HAVE_DBUS
+		return create_service_client(session+10);
+#else
+		throw exception("Can't create session \"%s\"",session);
+#endif // HAVE_DBUS
+
 	}
 
  }
diff --git a/src/libpw3270cpp/service.cc b/src/libpw3270cpp/service.cc
new file mode 100644
index 0000000..1d43358
--- /dev/null
+++ b/src/libpw3270cpp/service.cc
@@ -0,0 +1,409 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como service.cc e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ *
+ */
+
+ #include <lib3270/config.h>
+
+ #include <iostream>
+ #include <stdio.h>
+ #include <dbus/dbus.h>
+ #include <string.h>
+ #include <malloc.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <limits.h>
+
+ #ifndef DBUS_TIMEOUT_INFINITE
+	#define DBUS_TIMEOUT_INFINITE ((int) 0x7fffffff)
+ #endif // !DBUS_TIMEOUT_INFINITE
+
+ #include <pw3270cpp.h>
+ #include <lib3270/log.h>
+
+/*--[ Implement ]--------------------------------------------------------------------------------------------------*/
+
+ #ifdef HAVE_DBUS
+ namespace PW3270_NAMESPACE
+ {
+	DBusConnection	* conn;
+
+	class client : public session
+	{
+	private:
+		DBusConnection	* conn;
+		string 			  id;
+
+		DBusMessage * createMessage(const char *method)
+		{
+			DBusMessage * msg = dbus_message_new_method_call(	"br.com.bb.pw3270.service",		// Destination
+																"/br/com/bb/pw3270/service",	// Path
+																"br.com.bb.pw3270.service",		// Interface
+																method);						// method
+
+			if (!msg)
+				throw exception("Error creating DBUS message for method %s",method);
+
+			return msg;
+
+		}
+
+		DBusMessage	* call(DBusMessage *msg)
+		{
+			DBusMessage		* reply;
+			DBusError		  error;
+
+			dbus_error_init(&error);
+			reply = dbus_connection_send_with_reply_and_block(conn,msg,10000,&error);
+			dbus_message_unref(msg);
+
+			if(dbus_error_is_set(&error))
+			{
+				exception e = exception("%s",error.message);
+				dbus_error_free(&error);
+				throw e;
+			}
+
+			if(!reply)
+			{
+				exception e = exception("No reply for %s message","DBUS");
+				throw e;
+			}
+
+			return reply;
+		}
+
+		string getString(DBusMessage *msg)
+		{
+			string rc;
+
+			if(msg)
+			{
+				DBusMessageIter iter;
+
+				if(dbus_message_iter_init(msg, &iter))
+				{
+					if(dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING)
+					{
+						const char	* str;
+						dbus_message_iter_get_basic(&iter, &str);
+						trace("Response: [%s]",str);
+						rc.assign(str);
+						dbus_message_unref(msg);
+						return rc;
+					}
+
+					exception e = exception("DBUS Return type was %c, expecting %c",dbus_message_iter_get_arg_type(&iter),DBUS_TYPE_INT32);
+					dbus_message_unref(msg);
+
+					throw e;
+
+				}
+
+			}
+
+			return rc;
+
+		}
+
+		string getString(const char *method)
+		{
+			return getString(call(createMessage(method)));
+		}
+
+	protected:
+
+		virtual string get_text(int baddr = 0, size_t len = 1)
+		{
+
+		}
+
+		virtual string get_text_at(int row, int col, size_t sz)
+		{
+
+		}
+
+		virtual int set_text_at(int row, int col, const char *str)
+		{
+
+		}
+
+		virtual int cmp_text_at(int row, int col, const char *text)
+		{
+
+		}
+
+		virtual int emulate_input(const char *str)
+		{
+
+		}
+
+	public:
+		client(const char *session) throw (std::exception)
+		{
+			DBusError err;
+
+			dbus_error_init(&err);
+			conn = dbus_bus_get(DBUS_BUS_SESSION, &err);
+
+			if(dbus_error_is_set(&err))
+			{
+				exception e = exception("DBUS Connection Error (%s)", err.message);
+				dbus_error_free(&err);
+				throw e;
+			}
+
+			if(!conn)
+			{
+				throw exception("%s", "DBUS Connection failed");
+			}
+
+			if(*session != '?')
+			{
+				// Já tem sessão definida, usa.
+				this->id = session;
+			}
+			else
+			{
+				// Obter um ID de sessão no serviço
+				this->id = getString("createSession");
+			}
+
+			trace("Session=%s",this->id.c_str());
+
+		}
+
+		virtual ~client()
+		{
+
+		}
+
+		virtual bool is_connected(void)
+		{
+
+		}
+
+		virtual bool is_ready(void)
+		{
+
+		}
+
+		virtual LIB3270_CSTATE get_cstate(void)
+		{
+
+		}
+
+		virtual LIB3270_MESSAGE get_program_message(void)
+		{
+
+		}
+
+		virtual LIB3270_SSL_STATE get_secure(void)
+		{
+
+		}
+
+		virtual int get_width(void)
+		{
+
+		}
+
+		virtual int get_height(void)
+		{
+
+		}
+
+		virtual int get_length(void)
+		{
+
+		}
+
+		virtual void set_unlock_delay(unsigned short ms)
+		{
+
+		}
+
+		virtual int set_host_charset(const char *charset)
+		{
+
+		}
+
+		virtual string get_host_charset(void)
+		{
+
+		}
+
+		virtual int connect(void)
+		{
+
+		}
+
+		virtual int	set_url(const char *hostname)
+		{
+
+		}
+
+		virtual string get_url()
+		{
+
+		}
+
+		virtual int disconnect(void)
+		{
+
+		}
+
+		virtual int wait_for_ready(int seconds)
+		{
+
+		}
+
+		virtual int wait(int seconds)
+		{
+
+		}
+
+		virtual int iterate(bool wait = true)
+		{
+
+		}
+
+		virtual const char * asc2ebc(unsigned char *str, int sz = -1)
+		{
+
+		}
+
+		virtual const char * ebc2asc(unsigned char *str, int sz = -1)
+		{
+
+		}
+
+		virtual int set_cursor_position(int row, int col)
+		{
+
+		}
+
+		virtual int set_cursor_addr(int addr)
+		{
+
+		}
+
+		virtual int get_cursor_addr(void)
+		{
+
+		}
+
+		virtual int set_toggle(LIB3270_TOGGLE ix, bool value)
+		{
+
+		}
+
+		virtual int	 enter(void)
+		{
+
+		}
+
+		virtual int	 pfkey(int key)
+		{
+
+		}
+
+		virtual int	 pakey(int key)
+		{
+
+		}
+
+		virtual int	 quit(void)
+		{
+
+		}
+
+		virtual int	 action(const char *name)
+		{
+
+		}
+
+		virtual int erase(void)
+		{
+
+		}
+
+		virtual int erase_eof(void)
+		{
+
+		}
+
+		virtual int erase_eol(void)
+		{
+
+		}
+
+		virtual int erase_input(void)
+		{
+
+		}
+
+		virtual int print(void)
+		{
+
+		}
+
+		virtual int get_field_start(int baddr = -1)
+		{
+
+		}
+
+		virtual int get_field_len(int baddr = -1)
+		{
+
+		}
+
+		virtual int get_next_unprotected(int baddr = -1)
+		{
+
+		}
+
+		virtual int get_is_protected(int baddr = -1)
+		{
+
+		}
+
+		virtual int get_is_protected_at(int row, int col)
+		{
+
+		}
+
+
+	};
+
+	session	* create_service_client(const char *session) throw (std::exception)
+	{
+		return new client(session);
+	}
+
+
+ }
+ #endif // HAVE_DBUS
diff --git a/src/libpw3270cpp/testprogram.cc b/src/libpw3270cpp/testprogram.cc
index 5673a2d..2bc53e0 100644
--- a/src/libpw3270cpp/testprogram.cc
+++ b/src/libpw3270cpp/testprogram.cc
@@ -39,12 +39,15 @@
  int main(int numpar, char *param[])
  {
 
+	try
  	{
 		string	 s;
-		session	*session = session::start("pw3270:a");
+		session	*session = session::start("service://?");
 	//	session	*session = session::start("");
 	// 	session	*session = session::start("new");
 
+		return 0;
+
 		cout << "pw3270 version:  " << session->get_version() << endl;
 		cout << "pw3270 revision: " << session->get_revision() << endl << endl;
 
@@ -74,6 +77,11 @@
 		session->disconnect();
 		delete session;
  	}
+ 	catch(std::exception &e) {
+
+		cerr << e.what() << endl;
+		return -1;
+ 	}
 
 	// Waits
 	sleep(2);
--
libgit2 0.21.2