Compilando em windows

perry.werneck@gmail.com
1 parent 829568e6
Showing 7 changed files with 44 additions and 27 deletions Show diff stats
XtGlue.c
host.c
proxy.c
resolver.c
telnet.c
util.c
xio.c
@@ -31,6 +31,10 @@
  */
 /* glue for missing Xt code */
+#if defined(_WIN32)
+	#include <winsock2.h>
+	#include <windows.h>
+#endif // WIN32
 #include "globals.h"
 #include "api.h"
@@ -219,9 +223,9 @@ static unsigned long DefaultAddTimeOut(unsigned long interval_ms, H3270 *session
 		prev->next = t_new;
 	}
-	Trace("Timeout added: %p",t_new);
+	trace("Timeout added: %p",t_new);
-	return (unsigned long)t_new;
+	return (unsigned long) t_new;
 }
 static void DefaultRemoveTimeOut(unsigned long timer)
@@ -874,6 +878,9 @@ void RemoveTimeOut(unsigned long timer)
 unsigned long AddInput(int source, H3270 *session, void (*fn)(H3270 *session))
 {
 	CHECK_SESSION_HANDLE(session);
+
+	trace("Adding input %d",source);
+
 	if(callbacks->AddInput)
 		return callbacks->AddInput(source,session,fn);
 	return 0;
@@ -575,8 +575,8 @@ static int do_connect(H3270 *hSession, const char *n)
 	/* Prepare Xt for I/O. */
 //	x_add_input(hSession);
 #ifdef _WIN32
-	hSession->ns_exception_id	= AddExcept(hSession->sockEvent, hSession, net_exception);
-	hSession->ns_read_id		= AddInput(hSession->sockEvent, hSession, net_input);
+	hSession->ns_exception_id	= AddExcept((int) hSession->sockEvent, hSession, net_exception);
+	hSession->ns_read_id		= AddInput((int) hSession->sockEvent, hSession, net_input);
 #else
 	hSession->ns_exception_id	= AddExcept(hSession->sock, hSession, net_exception);
 	hSession->ns_read_id		= AddInput(hSession->sock, hSession, net_input);
@@ -35,6 +35,10 @@
  *	proxy.c
  *		This module implements various kinds of proxies.
  */
+#ifdef _WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+#endif // _WIN32
 #include "globals.h"
 #if !defined(PR3287) /*[*/
@@ -46,10 +50,9 @@
 	#include <stdlib.h>
 #endif
-#if defined(_WIN32) /*[*/
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else /*][*/
+#if defined(_WIN32)
+	#include <ws2tcpip.h>
+#else
 #include <malloc.h>
 #include <sys/socket.h>
@@ -35,23 +35,22 @@
  *		Hostname resolution.
  */
-#include "globals.h"
-
-#if defined(W3N4) || defined(W3N46) /*[*/
-	#error Deprecated
-#endif /*]*/
-
 #ifdef WIN32
-	/* Compiling for WinXP or later: Expose getaddrinfo()/freeaddrinfo(). */
+	// Compiling for WinXP or later: Expose getaddrinfo()/freeaddrinfo().
 	#undef _WIN32_WINNT
 	#define _WIN32_WINNT 0x0501
 	#include <winsock2.h>
+	#include <windows.h>
 	#include <ws2tcpip.h>
+	#include "globals.h"
+
 #else
+	#include "globals.h"
+
 	#include <sys/socket.h>
 	#include <netinet/in.h>
 	#include <netdb.h>
@@ -473,9 +473,13 @@ static int connect_sock(H3270 *hSession, int sockfd, const struct sockaddr *addr
 {
 	struct connect_parm p = { sizeof(struct connect_parm), sockfd, addr, addrlen, -1 };
+#ifdef _WIN32
+	do_connect_sock(hSession,&p);
+#else
 	trace("%s: Connect begin sock=%d",__FUNCTION__,p.sockfd);
 	lib3270_call_thread((int (*)(H3270 *, void *)) do_connect_sock,hSession,&p);
 	trace("%s: Connect ends, rc=%d",__FUNCTION__,p.err);
+#endif	// _WIN32
 	return p.err;
 }
@@ -683,7 +687,6 @@ int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Bo
 	/* all done */
 #if defined(_WIN32)
-
 	if(session->sockEvent == NULL)
 	{
 		char ename[256];
@@ -712,8 +715,12 @@ int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Bo
 		_exit(1);
 	}
+	trace("Socket: %d Event: %ld",session->sock,session->sockEvent);
+
 #endif // WIN32
+	non_blocking(session,1);
+
 	return 0;
 }
 #undef close_fail
@@ -956,9 +963,9 @@ void net_input(H3270 *session)
 	CHECK_SESSION_HANDLE(session);
-// #if defined(_WIN32)
+//#if defined(_WIN32)
 // 	for (;;)
-// #endif
+//#endif
 	{
 		if (session->sock < 0)
 			return;
@@ -1008,9 +1015,8 @@ void net_input(H3270 *session)
 		if (nr < 0)
 		{
 			if (socket_errno() == SE_EWOULDBLOCK)
-			{
 				return;
-			}
+
 #if defined(HAVE_LIBSSL) /*[*/
 			if(session->ssl_con != NULL)
 			{
@@ -1064,7 +1070,6 @@ void net_input(H3270 *session)
 		}
 		/* Process the data. */
-
 		if (HALF_CONNECTED)
 		{
 			if (non_blocking(session,False) < 0)
@@ -3209,6 +3214,8 @@ static int non_blocking(H3270 *session, Boolean on)
 #endif // FIONBIO
+	trace("Socket %d is %s",session->sock, on ? "non-blocking" : "blocking");
+
 	return 0;
 }
@@ -35,18 +35,19 @@
  *		Utility functions for x3270/c3270/s3270/tcl3270
  */
+#if defined(_WIN32)
+	#include <winsock2.h>
+	#include <windows.h>
+#endif // _WIN32
+
 #include "globals.h"
 #if defined(_WIN32)
-	#include <windows.h>
 	#include "winversc.h"
-
-	#include <winsock2.h>
 	#include <ws2tcpip.h>
 	#include <stdio.h>
 	#include <errno.h>
-
 	#include "w3miscc.h"
 #else
@@ -98,11 +98,11 @@ void x_except_on(H3270 *h)
 		RemoveInput(h->ns_read_id);
 #ifdef WIN32
-	h->ns_exception_id = AddExcept(h->sockEvent, h, net_exception);
+	h->ns_exception_id = AddExcept((int) h->sockEvent, h, net_exception);
 	h->excepting = True;
 	if(h->reading)
-		h->ns_read_id = AddInput(h->sockEvent, h, net_input);
+		h->ns_read_id = AddInput( (int) h->sockEvent, h, net_input);
 #else
 	h->ns_exception_id = AddExcept(h->sock, h, net_exception);
 	h->excepting = True;
	@@ -98,11 +98,11 @@ void x_except_on(H3270 *h)		@@ -98,11 +98,11 @@ void x_except_on(H3270 *h)
98	RemoveInput(h->ns_read_id);	98	RemoveInput(h->ns_read_id);
99		99
100	#ifdef WIN32	100	#ifdef WIN32
101	- h->ns_exception_id = AddExcept(h->sockEvent, h, net_exception);	101	+ h->ns_exception_id = AddExcept((int) h->sockEvent, h, net_exception);
102	h->excepting = True;	102	h->excepting = True;
103		103
104	if(h->reading)	104	if(h->reading)
105	- h->ns_read_id = AddInput(h->sockEvent, h, net_input);	105	+ h->ns_read_id = AddInput( (int) h->sockEvent, h, net_input);
106	#else	106	#else
107	h->ns_exception_id = AddExcept(h->sock, h, net_exception);	107	h->ns_exception_id = AddExcept(h->sock, h, net_exception);
108	h->excepting = True;	108	h->excepting = True;