Implementing IPC commom methods for windows.

Perry Werneck
1 parent 46b42c15
Showing 3 changed files with 54 additions and 5 deletions Show diff stats
src/lib3270++/private.h
src/lib3270++/windows/request.cc
src/lib3270++/windows/session.cc
@@ -241,8 +241,9 @@
 				};
 				struct {
-					DWORD 	  length;
-					DWORD	  used;
+					DWORD 	  length;	///< @brief Length of input buffer.
+					DWORD	  used;		///< @brief Length of used block.
+					DWORD	  current;	///< @brief Offset of the current argument.
 					uint8_t * block;
 				} in;
@@ -256,9 +257,12 @@
 					Type type;
 				};
-				/// @brief Create DataBlock
+				/// @brief Store value on data block.
 				DataBlock * pushBlock(const void *ptr, size_t len);
+				/// @brief Get next argument.
+				DataBlock * getNextBlock() const;
+
 #else
 				struct {
 					DBusMessage		* in;
@@ -290,7 +294,6 @@
 				Request & call();
 				// Push values
-
 				Request & push(const char *arg);
 				// Pop values
@@ -91,7 +91,7 @@
 	}
-	/// @brief Create DataBlock
+	/// @brief Store value on data block.
 	IPC::Request::DataBlock * IPC::Request::pushBlock(const void *ptr, size_t length) {
 		if((out.used + length + sizeof(IPC::Request::DataBlock)) >= out.length) {
@@ -107,17 +107,61 @@
 	}
+	/// @brief Get next argument.
+	IPC::Request::DataBlock * IPC::Request::getNextBlock() const {
+
+		if((in.current + sizeof(IPC::Request::DataBlock)) >= in.used) {
+			throw std::runtime_error("Out of range");
+		}
+
+		return (IPC::Request::DataBlock *) (in.block + in.current);
+
+	}
+
 	IPC::Request & IPC::Request::push(const char *arg) {
 		pushBlock(arg, strlen(arg)+1)->type = IPC::Request::String;
 		return *this;
 	}
 	IPC::Request & IPC::Request::pop(std::string &value) {
+		DataBlock * block = getNextBlock();
+
+		if(block->type != IPC::Request::String)
+			throw std::runtime_error("Invalid format");
+
+		const char *ptr = (const char *) (block+1);
+
+		in.current += (strlen(ptr)+1+sizeof(DataBlock));
+
+		value.assign(ptr);
 		return *this;
 	}
 	IPC::Request & IPC::Request::Request::pop(int &value) {
+
+		DataBlock * block = getNextBlock();
+
+		switch(block->type) {
+		case IPC::Request::Int16:
+			value = * ((int16_t *) (block+1));
+			in.current += sizeof(int16_t) + sizeof(DataBlock);
+			break;
+
+		case IPC::Request::Int32:
+			value = * ((int32_t *) (block+1));
+			in.current += sizeof(int32_t) + sizeof(DataBlock);
+			break;
+
+		case IPC::Request::Int64:
+			value = * ((int64_t *) (block+1));
+			in.current += sizeof(int64_t) + sizeof(DataBlock);
+			break;
+
+		default:
+			throw std::runtime_error("Invalid format");
+		}
+
 		return *this;
 	}
@@ -95,6 +95,8 @@
 		lib3270_trace_data(NULL,"Request block",(const char *) this->out.block, this->out.used);
 #endif // DEBUG
+		in.current = 0;
+
 		if(!TransactNamedPipe(
 				this->hPipe,
 				this->out.block,
	@@ -91,7 +91,7 @@		@@ -91,7 +91,7 @@
91		91
92	}	92	}
93		93
94	- /// @brief Create DataBlock	94	+ /// @brief Store value on data block.
95	IPC::Request::DataBlock * IPC::Request::pushBlock(const void *ptr, size_t length) {	95	IPC::Request::DataBlock * IPC::Request::pushBlock(const void *ptr, size_t length) {
96		96
97	if((out.used + length + sizeof(IPC::Request::DataBlock)) >= out.length) {	97	if((out.used + length + sizeof(IPC::Request::DataBlock)) >= out.length) {
	@@ -107,17 +107,61 @@		@@ -107,17 +107,61 @@
107		107
108	}	108	}
109		109
		110	+ /// @brief Get next argument.
		111	+ IPC::Request::DataBlock * IPC::Request::getNextBlock() const {
		112	+
		113	+ if((in.current + sizeof(IPC::Request::DataBlock)) >= in.used) {
		114	+ throw std::runtime_error("Out of range");
		115	+ }
		116	+
		117	+ return (IPC::Request::DataBlock *) (in.block + in.current);
		118	+
		119	+ }
		120	+
110	IPC::Request & IPC::Request::push(const char *arg) {	121	IPC::Request & IPC::Request::push(const char *arg) {
111	pushBlock(arg, strlen(arg)+1)->type = IPC::Request::String;	122	pushBlock(arg, strlen(arg)+1)->type = IPC::Request::String;
112	return *this;	123	return *this;
113	}	124	}
114		125
115	IPC::Request & IPC::Request::pop(std::string &value) {	126	IPC::Request & IPC::Request::pop(std::string &value) {
		127	+ DataBlock * block = getNextBlock();
		128	+
		129	+ if(block->type != IPC::Request::String)
		130	+ throw std::runtime_error("Invalid format");
		131	+
		132	+ const char ptr = (const char ) (block+1);
		133	+
		134	+ in.current += (strlen(ptr)+1+sizeof(DataBlock));
		135	+
		136	+ value.assign(ptr);
116		137
117	return *this;	138	return *this;
118	}	139	}
119		140
120	IPC::Request & IPC::Request::Request::pop(int &value) {	141	IPC::Request & IPC::Request::Request::pop(int &value) {
		142	+
		143	+ DataBlock * block = getNextBlock();
		144	+
		145	+ switch(block->type) {
		146	+ case IPC::Request::Int16:
		147	+ value = * ((int16_t *) (block+1));
		148	+ in.current += sizeof(int16_t) + sizeof(DataBlock);
		149	+ break;
		150	+
		151	+ case IPC::Request::Int32:
		152	+ value = * ((int32_t *) (block+1));
		153	+ in.current += sizeof(int32_t) + sizeof(DataBlock);
		154	+ break;
		155	+
		156	+ case IPC::Request::Int64:
		157	+ value = * ((int64_t *) (block+1));
		158	+ in.current += sizeof(int64_t) + sizeof(DataBlock);
		159	+ break;
		160	+
		161	+ default:
		162	+ throw std::runtime_error("Invalid format");
		163	+ }
		164	+
121	return *this;	165	return *this;
122	}	166	}
123		167