From 14b4a07654af63a2ae79f8a4ef15d61acc2862ed Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Mon, 26 Nov 2018 14:02:05 -0200
Subject: [PATCH] Fixing memory leaks, working on C++ API.

---
 .gitignore                               |  1 +
 src/include/lib3270++.h                  | 25 +++++++++++--------------
 src/lib3270++/host.cc                    | 22 ++++++++++++++++++++++
 src/lib3270++/lib3270++.cbp              |  4 +++-
 src/lib3270++/local/session.cc           | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 src/lib3270++/private.h                  |  6 +++---
 src/lib3270++/testprogram/testprogram.cc |  7 +++++++
 src/lib3270/session.c                    |  2 ++
 src/lib3270/testprogram/testprogram.c    |  3 +++
 9 files changed, 109 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index aaab80d..eb8e0c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ SRPMS
 resources.rc
 makeruntime.sh
 scripts
+vgcore.*
diff --git a/src/include/lib3270++.h b/src/include/lib3270++.h
index 99f19ad..1404430 100644
--- a/src/include/lib3270++.h
+++ b/src/include/lib3270++.h
@@ -203,9 +203,8 @@
 			virtual void waitForReady(time_t timeout = 5) throw() = 0;
 
 			// Gets
-			virtual std::string toString() const = 0;
-			virtual std::string	toString(int baddr = 0, size_t len = -1, bool lf = false) = 0;
-			virtual std::string	toString(int row, int col, size_t sz, bool lf = false) = 0;
+			virtual std::string	toString(int baddr = 0, size_t len = -1, char lf = '\n') const = 0;
+			virtual std::string	toString(int row, int col, size_t sz, char lf = '\n') const = 0;
 
 			inline operator std::string() const {
 				return toString();
@@ -281,9 +280,7 @@
 				return session->getConnectionState() == state;
 			}
 
-			inline void connect(const char *url) {
-				this->session->connect(url);
-			}
+			void connect(const char *url);
 
 			inline ProgramMessage getProgramMessage() const {
 				return session->getProgramMessage();
@@ -335,10 +332,7 @@
 				return *this;
 			}
 
-			inline Host & push(const Action action) {
-				session->push(action);
-				return *this;
-			}
+			Host & push(const Action action);
 
 			// Get contents.
 
@@ -357,6 +351,8 @@
 				return *this;
 			}
 
+			std::string toString() const;
+
 			// Event listeners
 			inline Host & insert(Event::Type type, std::function <void(const Event &event)> listener) noexcept {
 				session->insert(type, listener);
@@ -381,16 +377,17 @@
 		return session.pop(value);
 	}
 
-		template <typename T>
+	template <typename T>
 	inline TN3270_PUBLIC TN3270::Host & operator<<(TN3270::Host& host, const T value) {
 		return host.push(value);
 	}
 
-	template <typename T>
-	inline TN3270_PUBLIC TN3270::Host & operator>>(TN3270::Host& host, const T value) {
-		return host.pop(value);
+	inline std::ostream & operator<<(std::ostream &stream, const TN3270::Host& host) {
+        stream << host.toString();
+        return stream;
 	}
 
+
 #endif
 
 #endif // LIB3270_H_INCLUDED
diff --git a/src/lib3270++/host.cc b/src/lib3270++/host.cc
index 82a05b5..a6ecfc0 100644
--- a/src/lib3270++/host.cc
+++ b/src/lib3270++/host.cc
@@ -55,8 +55,15 @@
 		this->session = nullptr;
 	}
 
+    void Host::connect(const char *url) {
+        this->session->connect(url);
+        sync();
+    }
+
+
 	/// @brief Writes characters to the associated file from the put area
 	int Host::sync() {
+        this->session->waitForReady();
 		return 0;
 	}
 
@@ -74,5 +81,20 @@
 
 	}
 
+    Host & Host::push(const Action action) {
+        session->push(action);
+        sync();
+        return *this;
+    }
+
+	std::string Host::toString() const {
+
+	    if(this->session->getConnectionState() == TN3270::DISCONNECTED) {
+            throw std::system_error(ENOTCONN, std::system_category());
+	    }
+
+	    return this->session->toString();
+	}
+
  }
 
diff --git a/src/lib3270++/lib3270++.cbp b/src/lib3270++/lib3270++.cbp
index 2b6f978..566cef6 100644
--- a/src/lib3270++/lib3270++.cbp
+++ b/src/lib3270++/lib3270++.cbp
@@ -8,7 +8,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin/Debug/C++ Bindings for lib3270" prefix_auto="1" extension_auto="1" />
+				<Option output="../../.bin/Debug/lib3270++" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -42,6 +42,8 @@
 		</Linker>
 		<Unit filename="../include/lib3270++.h" />
 		<Unit filename="../include/lib3270.h" />
+		<Unit filename="../include/lib3270/action_table.h" />
+		<Unit filename="../include/lib3270/actions.h" />
 		<Unit filename="../include/lib3270/popup.h" />
 		<Unit filename="../include/lib3270/session.h" />
 		<Unit filename="abstract.cc" />
diff --git a/src/lib3270++/local/session.cc b/src/lib3270++/local/session.cc
index e0df4f5..aa8adcc 100644
--- a/src/lib3270++/local/session.cc
+++ b/src/lib3270++/local/session.cc
@@ -37,6 +37,7 @@
  */
 
  #include "../private.h"
+ #include <lib3270/actions.h>
 
  extern "C" {
 	 #include <lib3270/actions.h>
@@ -82,6 +83,8 @@
 
 	void Local::Session::wait(time_t timeout) {
 
+		std::lock_guard<std::mutex> lock(sync);
+
 		int rc = lib3270_wait_for_ready(this->hSession, timeout);
 
 		if(rc) {
@@ -98,9 +101,7 @@
             throw std::system_error(rc, std::system_category());
 		}
 
-		wait();
-
-	}
+    }
 
 	void Local::Session::disconnect() {
 		std::lock_guard<std::mutex> lock(sync);
@@ -109,23 +110,42 @@
 
 	// Wait for session state.
 	void Local::Session::waitForReady(time_t timeout) throw() {
+		this->wait(timeout);
+	}
 
-		std::lock_guard<std::mutex> lock(sync);
-		wait(timeout);
+	std::string	Local::Session::toString(int baddr, size_t len, char lf) const {
+
+		std::lock_guard<std::mutex> lock(const_cast<Local::Session *>(this)->sync);
+
+        char * text = lib3270_get_text(hSession, baddr, len, lf);
+
+        if(!text) {
+            throw std::runtime_error("Can't get screen contents");
+        }
+
+        string rc = convertFromHost(text);
+
+        lib3270_free(text);
+
+		return rc;
 
 	}
 
-	// Gets
-	std::string Local::Session::toString() const {
+	std::string	Local::Session::toString(int row, int col, size_t sz, char lf) const {
+
 		std::lock_guard<std::mutex> lock(const_cast<Local::Session *>(this)->sync);
-	}
 
-	std::string	Local::Session::toString(int baddr, size_t len, bool lf) {
-		std::lock_guard<std::mutex> lock(sync);
-	}
+        char * text = lib3270_get_text_at(hSession, row, col, sz, lf);
 
-	std::string	Local::Session::toString(int row, int col, size_t sz, bool lf) {
-		std::lock_guard<std::mutex> lock(sync);
+        if(!text) {
+            throw std::runtime_error("Can't get screen contents");
+        }
+
+        string rc = convertFromHost(text);
+
+        lib3270_free(text);
+
+		return rc;
 	}
 
 	ProgramMessage Local::Session::getProgramMessage() const {
@@ -168,6 +188,30 @@
 
 	TN3270::Session & Local::Session::push(const Action action) {
 		std::lock_guard<std::mutex> lock(sync);
+
+		switch(action) {
+        case ENTER:
+            lib3270_enter(hSession);
+            break;
+
+        case ERASE:
+            lib3270_erase(hSession);
+            break;
+
+        case ERASE_EOF:
+            lib3270_eraseeof(hSession);
+            break;
+
+        case ERASE_EOL:
+            lib3270_eraseeol(hSession);
+            break;
+
+        case ERASE_INPUT:
+            lib3270_eraseinput(hSession);
+            break;
+
+		}
+
 		return *this;
 	}
 
diff --git a/src/lib3270++/private.h b/src/lib3270++/private.h
index d8b285d..87aad4f 100644
--- a/src/lib3270++/private.h
+++ b/src/lib3270++/private.h
@@ -45,6 +45,7 @@
 	#include <lib3270++.h>
 	#include <lib3270/popup.h>
 	#include <system_error>
+	#include <stdexcept>
 
 
 #ifdef HAVE_ICONV
@@ -133,9 +134,8 @@
 				void waitForReady(time_t timeout = 5)  throw() override;
 
 				// Gets
-				std::string toString() const override;
-				std::string	toString(int baddr = 0, size_t len = -1, bool lf = false) override;
-				std::string	toString(int row, int col, size_t sz, bool lf = false) override;
+				std::string	toString(int baddr, size_t len, char lf) const override;
+				std::string	toString(int row, int col, size_t sz, char lf) const override;
 
 				ProgramMessage getProgramMessage() const override;
 
diff --git a/src/lib3270++/testprogram/testprogram.cc b/src/lib3270++/testprogram/testprogram.cc
index 75fe18b..65cc96f 100644
--- a/src/lib3270++/testprogram/testprogram.cc
+++ b/src/lib3270++/testprogram/testprogram.cc
@@ -39,6 +39,8 @@
  #include <cstdlib>
  #include <lib3270++.h>
 
+ using namespace std;
+
 /*---[ Implement ]----------------------------------------------------------------------------------*/
 
  int main(int argc, const char *argv[]) {
@@ -46,6 +48,11 @@
 	TN3270::Host host;
 
 	host.connect(getenv("TN3270URL"));
+	cout << host << endl;
+
+	host << TN3270::ENTER;
+
+
 
 	return 0;
  }
diff --git a/src/lib3270/session.c b/src/lib3270/session.c
index 1d3fdce..b7cf1ec 100644
--- a/src/lib3270/session.c
+++ b/src/lib3270/session.c
@@ -108,6 +108,8 @@ void lib3270_session_free(H3270 *h)
 	release_pointer(h->text);
 	release_pointer(h->zero_buf);
 
+	release_pointer(h->obuf_base);
+
 	release_pointer(h->sbbuf);
 	release_pointer(h->tabs);
 
diff --git a/src/lib3270/testprogram/testprogram.c b/src/lib3270/testprogram/testprogram.c
index fb4e486..806deae 100644
--- a/src/lib3270/testprogram/testprogram.c
+++ b/src/lib3270/testprogram/testprogram.c
@@ -26,6 +26,9 @@ int main(int numpar, char *param[])
 
 	lib3270_wait_for_ready(h,10);
 
+	lib3270_enter(h);
+
+	lib3270_wait_for_ready(h,10);
 
 	lib3270_session_free(h);
 
--
libgit2 0.21.2