Embutindo objeto de controle para plugins.

Perry Werneck
1 parent 5cb2c993
Showing 2 changed files with 62 additions and 42 deletions Show diff stats
src/classlib/local.cc
src/include/pw3270/class.h
@@ -115,12 +115,10 @@
  namespace PW3270_NAMESPACE
  {
- 	class local : public session, private module, private recursive_mutex
+ 	class local : public session, protected module, protected recursive_mutex
  	{
 	private:
-		H3270 * hSession;
-
 		// Lib3270 entry points
 		const char * 		(*_get_version)(void);
 		LIB3270_CSTATE		(*_get_connection_state)(H3270 *h);
@@ -173,6 +171,10 @@
 		const char * 		(*_ebc2asc)(H3270 *hSession, unsigned char *buffer, int sz);
 		const char * 		(*_asc2ebc)(H3270 *hSession, unsigned char *buffer, int sz);
+	protected:
+
+		H3270 * hSession;
+
 		void load_methods() {
 			void	(*set_log_handler)(void (*loghandler)(H3270 *, const char *, int, const char *, va_list));
@@ -260,45 +262,10 @@
 		local() throw(std::exception) : module("lib3270",PACKAGE_VERSION)
 		{
-			H3270 * (*lib3270_new)(const char *) = (H3270 * (*)(const char *)) get_symbol("lib3270_session_new");
-
-			if(!lib3270_new)
-				throw exception("Can't find symbol %s","lib3270_session_new");
-
-			this->hSession = lib3270_new("");
-
-			load_methods();
-
-		}
-
-		local(H3270 * hSession) throw(std::exception) : module("lib3270",PACKAGE_VERSION)
-		{
-			this->hSession = hSession;
-			load_methods();
 		}
 		virtual ~local()
 		{
-			this->lock();
-
-			if(is_connected()) {
-				disconnect();
-			}
-
-			try
-			{
-				static void	(*session_free)(H3270 *h) = (void (*)(H3270 *)) get_symbol("lib3270_session_free");
-
-				if(session_free && this->hSession)
-					session_free(this->hSession);
-
-				this->hSession = 0;
-
-			}
-			catch(exception e) { }
-
-			this->unlock();
-
 		}
 		bool is_connected(void)
@@ -559,12 +526,65 @@
 	session	* session::create_local(void) throw (std::exception)
 	{
-		return new local();
+		class obj : public local {
+		public:
+			obj() : local() {
+
+				H3270 * (*lib3270_new)(const char *) = (H3270 * (*)(const char *)) get_symbol("lib3270_session_new");
+
+				if(!lib3270_new)
+					throw exception("Can't find symbol %s","lib3270_session_new");
+
+				this->hSession = lib3270_new("");
+
+				load_methods();
+
+			}
+
+			virtual ~obj() {
+
+				this->lock();
+
+				if(is_connected()) {
+					disconnect();
+				}
+
+				try
+				{
+					static void	(*session_free)(H3270 *h) = (void (*)(H3270 *)) get_symbol("lib3270_session_free");
+
+					if(session_free && this->hSession)
+						session_free(this->hSession);
+
+					this->hSession = 0;
+
+				}
+				catch(exception e) { }
+
+				this->unlock();
+
+			}
+		};
+
+		return new obj();
 	}
 	session	* session::create_local(H3270 *hSession) throw (std::exception)
 	{
-		return new local(hSession);
+		class obj : public local {
+		public:
+			obj(H3270 *hSession) : local()
+			{
+				this->hSession = hSession;
+				load_methods();
+			}
+
+			virtual ~obj() {
+			}
+
+		};
+
+		return new obj(hSession);
 	}
  }
@@ -135,6 +135,8 @@
 		// Factory methods and settings
 		static session	* start(const char *name = 0);
 		static session	* create(const char *name = 0) throw (std::exception);
+		static session	* create_local(H3270 *hSession) throw (std::exception);
+
 		static session	* get_default(void);
 		static bool		  has_default(void);
 		static void		  set_plugin(session * (*factory)(const char *name));
@@ -255,8 +257,6 @@
 		string 					  get_3270_text(const char *str);
 		string 					  get_local_text(const char *str);
-		static session			* create_local(H3270 *hSession) throw (std::exception);
-
 	protected:
 		session();