Melhorando tratamento de erros no hllapi

perry.werneck@gmail.com
1 parent b2a6f0d2
Showing 5 changed files with 53 additions and 20 deletions Show diff stats
src/include/pw3270/hllapi.h
src/plugins/remotectl/hllapi.c
src/plugins/remotectl/pipesource.c
src/plugins/remotectl/remotectl.c
src/plugins/remotectl/testprogram.c
@@ -42,7 +42,7 @@ extern &quot;C&quot; {
  #define HLLAPI_MAXLENGTH				32768
  #define HLLAPI_CMD_CONNECTPS				   1	/**< connect presentation space				*/
- #define HLLAPI_CMD_SENDSTRING				   3	/**< send string							*/
+ #define HLLAPI_CMD_INPUTSTRING				   3	/**< send string							*/
  #define HLLAPI_CMD_COPYPSTOSTR				   8	/**< copy presentation space to string		*/
  #define HLLAPI_CMD_SETCURSOR				  40	/**< set cursor								*/
  #define HLLAPI_CMD_GETREVISION				2000	/**< Get lib3270 revision					*/
@@ -63,6 +63,8 @@
 		DWORD cbSize		= sizeof(HLLAPI_DATA) + length;
 		HLLAPI_DATA *data	= malloc(cbSize+1);
+		memset(buffer,0,HLLAPI_MAXLENGTH);
+
 		data->id		= HLLAPI_REQUEST_ID;
 		data->func		= func;
 		data->rc		= *rc;
@@ -71,15 +73,18 @@
 		if(string && length > 0)
 			memcpy(data->string,string,length);
-		if(!CallNamedPipe(PipeName,(LPVOID)data,cbSize,buffer,HLLAPI_MAXLENGTH,&cbSize,NMPWAIT_USE_DEFAULT_WAIT))
+		memset(buffer,0,HLLAPI_MAXLENGTH);		if(!CallNamedPipe(PipeName,(LPVOID)data,cbSize,buffer,HLLAPI_MAXLENGTH,&cbSize,NMPWAIT_USE_DEFAULT_WAIT))
 		{
 			result = GetLastError();
 		}
 		else
 		{
 			int sz = length < buffer->len ? length : buffer->len;
+
 			*rc = buffer->rc;
+			trace("%s: Query rc=%d",__FUNCTION__,(int) buffer->rc);
+
 			if(string && sz > 0)
 				memcpy(string,buffer->string,sz);
@@ -120,7 +125,7 @@
 	default:
 		if(!session_name)
 		{
-			if(set_session_name("pw3270"))
+			if(set_session_name("pw3270A"))
 				return ENOENT;
 		}
 		result = run_query(func, str, length, rc);
@@ -74,13 +74,13 @@ static void wait_for_client(pipe_source *source)
 	{
 	// The overlapped connection in progress.
 	case ERROR_IO_PENDING:
-		trace("%s: ERROR_IO_PENDING",__FUNCTION__);
+		// trace("%s: ERROR_IO_PENDING",__FUNCTION__);
 		source->state = PIPE_STATE_WAITING;
 		break;
 	// Client is already connected, so signal an event.
 	case ERROR_PIPE_CONNECTED:
-		trace("%s: ERROR_PIPE_CONNECTED",__FUNCTION__);
+		// trace("%s: ERROR_PIPE_CONNECTED",__FUNCTION__);
 		if(SetEvent(source->overlap.hEvent))
 			break;
@@ -108,7 +108,7 @@ static void wait_for_client(pipe_source *source)
 	 */
 	if(WaitForSingleObject(((pipe_source *) source)->overlap.hEvent,0) == WAIT_OBJECT_0)
 	{
-		trace("%s: source=%p",__FUNCTION__,source);
+		// trace("%s: source=%p",__FUNCTION__,source);
 		return TRUE;
 	}
@@ -142,6 +142,9 @@ static void wait_for_client(pipe_source *source)
 		DWORD wrote;
 		data->rc = run_hllapi(data->func,data->string,data->len,data->rc);
 		wrote = sizeof(HLLAPI_DATA)+data->len;
+
+		trace("%s rc=%d",__FUNCTION__,(int) data->rc);
+
 		WriteFile(source->hPipe,data,wrote,&wrote,NULL);
 	}
@@ -157,18 +160,21 @@ static void wait_for_client(pipe_source *source)
 	// The read operation is still pending.
 	switch(GetLastError())
 	{
+	case 0:
+		break;
+
 	case ERROR_IO_PENDING:
-		trace("%s: PIPE_STATE_PENDING_READ",__FUNCTION__);
+		// trace("%s: PIPE_STATE_PENDING_READ",__FUNCTION__);
 		source->state = PIPE_STATE_PENDING_READ;
 		break;
 	case ERROR_PIPE_LISTENING:
-		trace("%s: ERROR_PIPE_LISTENING",__FUNCTION__);
+		// trace("%s: ERROR_PIPE_LISTENING",__FUNCTION__);
 		source->state = PIPE_STATE_READ;
 		break;
 	case ERROR_BROKEN_PIPE:
-		trace("%s: ERROR_BROKEN_PIPE",__FUNCTION__);
+		// trace("%s: ERROR_BROKEN_PIPE",__FUNCTION__);
 		if(!DisconnectNamedPipe(source->hPipe))
 			popup_lasterror("%s",_( "Error in DisconnectNamedPipe" ));
 		else
@@ -176,7 +182,7 @@ static void wait_for_client(pipe_source *source)
 		break;
 	case ERROR_PIPE_NOT_CONNECTED:
-		trace("%s: ERROR_PIPE_NOT_CONNECTED",__FUNCTION__);
+		// trace("%s: ERROR_PIPE_NOT_CONNECTED",__FUNCTION__);
 		break;
 	default:
@@ -203,14 +209,14 @@ static void wait_for_client(pipe_source *source)
 	fSuccess = GetOverlappedResult(((pipe_source *) source)->hPipe,&((pipe_source *) source)->overlap,&cbRead,FALSE );
-	trace("%s: source=%p data=%p Result=%s cbRead=%d",__FUNCTION__,source,data,fSuccess ? "Success" : "Unsuccess",(int) cbRead);
+	// trace("%s: source=%p data=%p Result=%s cbRead=%d",__FUNCTION__,source,data,fSuccess ? "Success" : "Unsuccess",(int) cbRead);
 	switch(((pipe_source *) source)->state)
 	{
 	case PIPE_STATE_WAITING:
 		if(fSuccess)
 		{
-			trace("Pipe connected (cbRet=%d)",(int) cbRead);
+			// trace("Pipe connected (cbRet=%d)",(int) cbRead);
 			((pipe_source *) source)->state = PIPE_STATE_READ;
 		}
 		else
@@ -220,7 +226,7 @@ static void wait_for_client(pipe_source *source)
 		break;
 	case PIPE_STATE_READ:
-		trace("Reading pipe (cbRead=%d)",(int) cbRead);
+		// trace("Reading pipe (cbRead=%d)",(int) cbRead);
 		read_input_pipe( (pipe_source *) source);
 		break;
@@ -230,10 +236,10 @@ static void wait_for_client(pipe_source *source)
 		((pipe_source *) source)->state = PIPE_STATE_READ;
 		break;
-#ifdef DEBUG
-	default:
-		trace("%s: source=%p data=%p Unexpected mode %d",__FUNCTION__,source,data,((pipe_source *) source)->state);
-#endif
+//#ifdef DEBUG
+//	default:
+//		trace("%s: source=%p data=%p Unexpected mode %d",__FUNCTION__,source,data,((pipe_source *) source)->state);
+//#endif
 	}
 	return TRUE;
@@ -241,7 +247,7 @@ static void wait_for_client(pipe_source *source)
  static void IO_finalize(GSource *source)
  {
-	trace("%s: source=%p",__FUNCTION__,source);
+//	trace("%s: source=%p",__FUNCTION__,source);
 	if( ((pipe_source *) source)->hPipe != INVALID_HANDLE_VALUE)
 	{
@@ -253,7 +259,7 @@ static void wait_for_client(pipe_source *source)
  static gboolean IO_closure(gpointer data)
  {
-	trace("%s: data=%p",__FUNCTION__,data);
+//	trace("%s: data=%p",__FUNCTION__,data);
 	return 0;
  }
@@ -150,6 +150,18 @@
 	return 0;
  }
+ static int cmd_sendstring(unsigned short rc, char *string, unsigned short length)
+ {
+	H3270 *hSession = lib3270_get_default_session_handle();
+
+	if(!lib3270_connected(hSession))
+		return ENOTCONN;
+
+	#warning Converter formato da string e incluir no buffer
+
+	return 0;
+ }
+
  int run_hllapi(unsigned long function, char *string, unsigned short length, unsigned short rc)
  {
 	static const struct _cmd
@@ -159,16 +171,20 @@
 	} cmd[] =
 	{
 		{ HLLAPI_CMD_SETCURSOR,		cmd_setcursor	},
+		{ HLLAPI_CMD_INPUTSTRING,	cmd_sendstring	},
 		{ HLLAPI_CMD_GETREVISION,	cmd_getrevision }
 	};
 	int f;
+	trace("HLLAPI function %d",(int) function);
+
 	for(f=0;f<G_N_ELEMENTS(cmd);f++)
 	{
 		if(cmd[f].function == function)
 			return cmd[f].exec(rc,string,length);
 	}
+	g_warning("Unexpected HLLAPI function %d",(int) function);
  	return EINVAL;
  }
@@ -39,12 +39,18 @@
 	unsigned short rc;
 	// Set session name
-	strcpy(buffer,"pw3270");
+	strcpy(buffer,"pw3270A");
 	printf("ConnectPS exits with %d\n[%s]\n",hllapi(HLLAPI_CMD_CONNECTPS,buffer,1024,&rc),buffer);
 	// Test for GetRevision call
 	*buffer = 0;
 	printf("GetRevision exits with %d\n[%s]\n",hllapi(HLLAPI_CMD_GETREVISION,buffer,1024,&rc),buffer);
+	printf("query rc=%d\n\n",rc);
+
+	// Test for string input
+	strcpy(buffer,"test");
+	printf("InputString exits with %d\n[%s]\n",hllapi(HLLAPI_CMD_INPUTSTRING,buffer,1024,&rc),buffer);
+	printf("query rc=%d\n\n",rc);
  	return 0;
  }
	@@ -42,7 +42,7 @@ extern "C" {		@@ -42,7 +42,7 @@ extern "C" {
42	#define HLLAPI_MAXLENGTH 32768	42	#define HLLAPI_MAXLENGTH 32768
43		43
44	#define HLLAPI_CMD_CONNECTPS 1 /*< connect presentation space /	44	#define HLLAPI_CMD_CONNECTPS 1 /*< connect presentation space /
45	- #define HLLAPI_CMD_SENDSTRING 3 /*< send string /	45	+ #define HLLAPI_CMD_INPUTSTRING 3 /*< send string /
46	#define HLLAPI_CMD_COPYPSTOSTR 8 /*< copy presentation space to string /	46	#define HLLAPI_CMD_COPYPSTOSTR 8 /*< copy presentation space to string /
47	#define HLLAPI_CMD_SETCURSOR 40 /*< set cursor /	47	#define HLLAPI_CMD_SETCURSOR 40 /*< set cursor /
48	#define HLLAPI_CMD_GETREVISION 2000 /*< Get lib3270 revision /	48	#define HLLAPI_CMD_GETREVISION 2000 /*< Get lib3270 revision /