Updating IPC module.

Perry Werneck
1 parent d1524662
Showing 6 changed files with 120 additions and 39 deletions Show diff stats
client/src/core/constants.cc
client/src/include/ipc-client-internals.h
client/src/session/local/session.cc
client/src/session/remote/session.cc
client/src/testprogram/testprogram.cc
common/src/include/lib3270/ipc.h
@@ -80,6 +80,54 @@ TN3270_PUBLIC const char * toCharString(const TN3270::Action action) {
     return actions[action];
 }
+TN3270_PUBLIC const char * toCharString(const TN3270::ProgramMessage programMessage) {
+
+	static const char *messages[] = {
+		"",
+		"X System",
+		"X Wait",
+		"Connected"
+		"X Not Connected",
+		"Awaiting first",
+		"X -f",
+		"X Protected",
+		"X Numeric",
+		"X Overflow",
+		"X Inhibit",
+		"KybdLock",
+		"X",
+		"X Resolving",
+		"X Connecting",
+	};
+
+    if( ((size_t) programMessage) > (sizeof(messages)/sizeof(messages[0]))) {
+        throw std::system_error(EINVAL, std::system_category());
+    }
+
+    return messages[programMessage];
+}
+
+TN3270_PUBLIC const char * toCharString(const TN3270::ConnectionState connectionState) {
+
+	static const char *states[] = {
+		"Disconnected",
+		"Resolving hostname",
+		"Pending",
+		"Connected, no mode yet",
+		"Connected in NVT ANSI mode",
+		"Connected in old-style 3270 mode",
+		"Connected in TN3270E mode, unnegotiated",
+		"Connected in TN3270E mode, NVT mode",
+		"Connected in TN3270E mode, SSCP-LU mode",
+		"Connected in TN3270E mode, 3270 mode",
+	};
+
+    if( ((size_t) connectionState) > (sizeof(states)/sizeof(states[0]))) {
+        throw std::system_error(EINVAL, std::system_category());
+    }
+
+    return states[connectionState];
+}
@@ -186,6 +186,7 @@
 				std::string getVersion() const override;
 				std::string getRevision() const override;
+				std::string getLUName() const override;
 				// Gets
 				std::string	toString(int baddr, size_t len, char lf) const override;
@@ -195,9 +196,9 @@
 				ConnectionState getConnectionState() const override;
-				TN3270::Session & setCursorPosition(unsigned short addr) override;
-				TN3270::Session & setCursorPosition(unsigned short row, unsigned short col) override;
-				unsigned short getCursorPosition() override;
+				TN3270::Session & setCursor(unsigned short addr) override;
+				TN3270::Session & setCursor(unsigned short row, unsigned short col) override;
+				unsigned short getCursorAddress() override;
 				TN3270::Session & pfkey(unsigned short value);
 				TN3270::Session & pakey(unsigned short value);
@@ -361,8 +362,10 @@
 				std::string getVersion() const override;
 				std::string getRevision() const override;
+				std::string getLUName() const override;
 				// Set properties.
+				void setProperty(const char *name, const int value) const;
 				void setUnlockDelay(unsigned short delay = 350) override;
 				// Gets
@@ -373,9 +376,9 @@
 				ConnectionState getConnectionState() const override;
-				TN3270::Session & setCursorPosition(unsigned short addr) override;
-				TN3270::Session & setCursorPosition(unsigned short row, unsigned short col) override;
-				unsigned short getCursorPosition() override;
+				TN3270::Session & setCursor(unsigned short addr) override;
+				TN3270::Session & setCursor(unsigned short row, unsigned short col) override;
+				unsigned short getCursorAddress() override;
 				TN3270::Session & pfkey(unsigned short value);
 				TN3270::Session & pakey(unsigned short value);
@@ -413,7 +413,7 @@
 	/// @brief Set cursor address.
 	///
 	/// @param addr	Cursor address.
-	TN3270::Session & Local::Session::setCursorPosition(unsigned short addr) {
+	TN3270::Session & Local::Session::setCursor(unsigned short addr) {
 		if(lib3270_set_cursor_address(hSession,addr) < 0) {
 			throw std::system_error(errno, std::system_category());
@@ -425,7 +425,7 @@
 	/// @brief Get cursor address.
 	///
 	/// @return
-	unsigned short Local::Session::getCursorPosition() {
+	unsigned short Local::Session::getCursorAddress() {
 		unsigned int position = lib3270_get_cursor_address(hSession);
@@ -440,7 +440,7 @@
 	///
 	/// @param row	New cursor row.
 	/// @param col	New cursor column.
-	TN3270::Session & Local::Session::setCursorPosition(unsigned short row, unsigned short col) {
+	TN3270::Session & Local::Session::setCursor(unsigned short row, unsigned short col) {
 		if(lib3270_set_cursor_position(hSession,row,col)) {
 			throw std::system_error(errno, std::system_category());
@@ -459,6 +459,13 @@
 		return lib3270_get_revision();
 	}
+	std::string Local::Session::getLUName() const {
+		const char * luname =  lib3270_get_luname(hSession);
+		if(luname)
+			return luname;
+		return "";
+	}
+
 	/// @brief Execute action by name.
 	TN3270::Session & Local::Session::action(const char *action_name) {
@@ -266,27 +266,18 @@
 	/// @brief Set cursor address.
 	///
 	/// @param addr	Cursor address.
-	TN3270::Session & IPC::Session::setCursorPosition(unsigned short addr) {
-
-		int32_t rc;
-
-		Request(*this,"setCursorAddress")
-			.push((uint32_t) addr)
-			.call()
-			.pop(rc);
-
-		if(rc) {
-            throw std::system_error((int) rc, std::system_category());
-		}
+	TN3270::Session & IPC::Session::setCursor(unsigned short addr) {
+		setProperty("setCursorAddress", (uint32_t) addr);
 		return *this;
 	}
-	unsigned short IPC::Session::getCursorPosition() {
+	unsigned short IPC::Session::getCursorAddress() {
-		// TODO: Implement it.
-		throw std::system_error((int) ENOTSUP, std::system_category());
+		int32_t address;
+		getProperty("cursor_address",address);
+		return (unsigned short) address;
 	}
@@ -294,7 +285,7 @@
 	///
 	/// @param row	New cursor row.
 	/// @param col	New cursor column.
-	TN3270::Session & IPC::Session::setCursorPosition(unsigned short row, unsigned short col) {
+	TN3270::Session & IPC::Session::setCursor(unsigned short row, unsigned short col) {
 		int32_t rc;
@@ -320,6 +311,21 @@
 	}
+	void IPC::Session::setProperty(const char *name, const int value) const {
+
+		int32_t rc;
+
+		Request(*this,true,name)
+			.push(value)
+			.call()
+			.pop(rc);
+
+		if(rc) {
+            throw std::system_error((int) rc, std::system_category());
+		}
+
+	}
+
 	void IPC::Session::getProperty(const char *name, std::string &value) const {
 		Request(*this,false,name)
@@ -350,6 +356,14 @@
 	}
+	std::string IPC::Session::getLUName() const {
+
+		string rc;
+		getProperty("luname",rc);
+		return rc;
+
+	}
+
 	/// @brief Execute action by name.
 	TN3270::Session & IPC::Session::action(const char *action_name) {
@@ -381,6 +395,8 @@
 	void IPC::Session::setUnlockDelay(unsigned short delay) {
+		setProperty("unlock_delay", (uint32_t) delay);
+
 	}
  }
@@ -46,7 +46,7 @@
  int main(int argc, char **argv) {
-	const char * session = ""; // "pw3270:a";
+	const char * session = "pw3270:a";
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
@@ -82,8 +82,9 @@
 			<< std::endl;
 		cout
-			<< "Connection state is " << host.getConnectionState()
-			<< "\tProgram message is " << host.getProgramMessage()
+			<< "Connection state is " << toCharString(host.getConnectionState()) << std::endl
+			<< "Program message is " << toCharString(host.getProgramMessage()) << std::endl
+			<< "Luname is " << host.getLUName() << std::endl
 			<< std::endl;
@@ -253,6 +253,7 @@
 			virtual std::string getVersion() const = 0;
 			virtual std::string getRevision() const = 0;
+			virtual std::string getLUName() const = 0;
 			virtual ProgramMessage getProgramMessage() const = 0;
 			inline operator ProgramMessage() const {
@@ -284,13 +285,13 @@
 			virtual Session & input(const char *text, size_t length) = 0;
 			/// @brief Set cursor address.
-			virtual TN3270::Session & setCursorPosition(unsigned short addr) = 0;
+			virtual TN3270::Session & setCursor(unsigned short addr) = 0;
 			/// @brief Set cursor position.
-			virtual TN3270::Session & setCursorPosition(unsigned short row, unsigned short col) = 0;
+			virtual TN3270::Session & setCursor(unsigned short row, unsigned short col) = 0;
 			/// @brief Get cursor address
-			virtual unsigned short getCursorPosition() = 0;
+			virtual unsigned short getCursorAddress() = 0;
 			/// @brief Send PF.
 			virtual Session & pfkey(unsigned short value) = 0;
@@ -400,18 +401,18 @@
 			}
 			/// @brief Set cursor address.
-			inline void setCursorPosition(unsigned short addr) {
-				session->setCursorPosition(addr);
+			inline void setCursor(unsigned short addr) {
+				session->setCursor(addr);
 			}
 			/// @brief Set cursor position.
-			inline void setCursorPosition(unsigned short row, unsigned short col) {
-				session->setCursorPosition(row,col);
+			inline void setCursor(unsigned short row, unsigned short col) {
+				session->setCursor(row,col);
 			}
 			/// @brief Get cursor address
-			inline unsigned short getCursorPosition() {
-				return session->getCursorPosition();
+			inline unsigned short getCursorAddress() {
+				return session->getCursorAddress();
 			}
 			// Get properties
@@ -426,6 +427,11 @@
 				return session->getRevision();
 			}
+			/// @brief Get LU Name.
+			std::string getLUName() const {
+				return session->getLUName();
+			}
+
 			// Actions
 			/// @brief Send PF.
@@ -515,8 +521,8 @@
 	}
-	TN3270_PUBLIC const char * toCharString(const TN3270::ProgramMessage programMessage) noexcept;
-	TN3270_PUBLIC const char * toCharString(const TN3270::ConnectionState connectionState) noexcept;
+	TN3270_PUBLIC const char * toCharString(const TN3270::ProgramMessage programMessage);
+	TN3270_PUBLIC const char * toCharString(const TN3270::ConnectionState connectionState);
 	TN3270_PUBLIC const char * toCharString(const TN3270::Action action);
 	template <typename T>
	@@ -80,6 +80,54 @@ TN3270_PUBLIC const char * toCharString(const TN3270::Action action) {		@@ -80,6 +80,54 @@ TN3270_PUBLIC const char * toCharString(const TN3270::Action action) {
80	return actions[action];	80	return actions[action];
81	}	81	}
82		82
		83	+TN3270_PUBLIC const char * toCharString(const TN3270::ProgramMessage programMessage) {
		84	+
		85	+ static const char *messages[] = {
		86	+ "",
		87	+ "X System",
		88	+ "X Wait",
		89	+ "Connected"
		90	+ "X Not Connected",
		91	+ "Awaiting first",
		92	+ "X -f",
		93	+ "X Protected",
		94	+ "X Numeric",
		95	+ "X Overflow",
		96	+ "X Inhibit",
		97	+ "KybdLock",
		98	+ "X",
		99	+ "X Resolving",
		100	+ "X Connecting",
		101	+ };
		102	+
		103	+ if( ((size_t) programMessage) > (sizeof(messages)/sizeof(messages[0]))) {
		104	+ throw std::system_error(EINVAL, std::system_category());
		105	+ }
		106	+
		107	+ return messages[programMessage];
		108	+}
		109	+
		110	+TN3270_PUBLIC const char * toCharString(const TN3270::ConnectionState connectionState) {
		111	+
		112	+ static const char *states[] = {
		113	+ "Disconnected",
		114	+ "Resolving hostname",
		115	+ "Pending",
		116	+ "Connected, no mode yet",
		117	+ "Connected in NVT ANSI mode",
		118	+ "Connected in old-style 3270 mode",
		119	+ "Connected in TN3270E mode, unnegotiated",
		120	+ "Connected in TN3270E mode, NVT mode",
		121	+ "Connected in TN3270E mode, SSCP-LU mode",
		122	+ "Connected in TN3270E mode, 3270 mode",
		123	+ };
		124	+
		125	+ if( ((size_t) connectionState) > (sizeof(states)/sizeof(states[0]))) {
		126	+ throw std::system_error(EINVAL, std::system_category());
		127	+ }
		128	+
		129	+ return states[connectionState];
		130	+}
83		131
84		132
85		133