Fixing windows build.

Perry Werneck
1 parent 8321dde6
Showing 2 changed files with 16 additions and 30 deletions Show diff stats
src/core/iocalls.c
src/core/windows/connect.c
@@ -531,7 +531,7 @@ int non_blocking(H3270 *hSession, Boolean on)
 		WSASetLastError(0);
 		u_long iMode= on ? 1 : 0;
-		if(ioctlsocket(hSession->sock,FIONBIO,&iMode))
+		if(ioctlsocket(hSession->connection.sock,FIONBIO,&iMode))
 		{
 			lib3270_popup_dialog(	hSession,
 									LIB3270_NOTIFY_ERROR,
@@ -47,7 +47,7 @@
 	#include <iconv.h>
 #endif // HAVE_ICONV
-#define SOCK_CLOSE(s)	closesocket(s->sock); s->sock = -1;
+#define SOCK_CLOSE(s)	closesocket(s->connection.sock); s->connection.sock = -1;
 #include "hostc.h"
 #include "trace_dsc.h"
@@ -70,7 +70,7 @@ static void net_connected(H3270 *hSession, int GNUC_UNUSED(fd), LIB3270_IO_FLAG 
 		hSession->xio.write = NULL;
 	}
-	if(getsockopt(hSession->sock, SOL_SOCKET, SO_ERROR, (char *) &err, &len) < 0)
+	if(getsockopt(hSession->connection.sock, SOL_SOCKET, SO_ERROR, (char *) &err, &len) < 0)
 	{
 		lib3270_disconnect(hSession);
 		lib3270_popup_dialog(	hSession,
@@ -97,8 +97,8 @@ static void net_connected(H3270 *hSession, int GNUC_UNUSED(fd), LIB3270_IO_FLAG 
 		return;
 	}
-	hSession->xio.except	= lib3270_add_poll_fd(hSession,hSession->sock,LIB3270_IO_FLAG_EXCEPTION,net_exception,0);
-	hSession->xio.read		= lib3270_add_poll_fd(hSession,hSession->sock,LIB3270_IO_FLAG_READ,net_input,0);
+	hSession->xio.except	= lib3270_add_poll_fd(hSession,hSession->connection.sock,LIB3270_IO_FLAG_EXCEPTION,net_exception,0);
+	hSession->xio.read		= lib3270_add_poll_fd(hSession,hSession->connection.sock,LIB3270_IO_FLAG_READ,net_input,0);
 #if defined(HAVE_LIBSSL)
 	if(hSession->ssl.con && hSession->ssl.state == LIB3270_SSL_UNDEFINED)
@@ -187,10 +187,10 @@ static void sockstart(H3270 *session)
 	status_connecting(hSession);
-	for(rp = result; hSession->sock < 0 && rp != NULL; rp = rp->ai_next)
+	for(rp = result; hSession->connection.sock < 0 && rp != NULL; rp = rp->ai_next)
 	{
-		hSession->sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-		if(hSession->sock < 0)
+		hSession->connection.sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+		if(hSession->connection.sock < 0)
 		{
 			((struct resolver *) host)->rc = errno;
 			((struct resolver *) host)->message = strerror(errno);
@@ -198,7 +198,7 @@ static void sockstart(H3270 *session)
 		}
 		// Connected!
-		if(connect(hSession->sock, rp->ai_addr, rp->ai_addrlen))
+		if(connect(hSession->connection.sock, rp->ai_addr, rp->ai_addrlen))
 		{
 			SOCK_CLOSE(hSession);
 			((struct resolver *) host)->rc = errno;
@@ -222,7 +222,7 @@ int net_reconnect(H3270 *hSession, int seconds)
 	sockstart(hSession);
-	if(lib3270_run_task(hSession, background_connect, &host) || hSession->sock < 0)
+	if(lib3270_run_task(hSession, background_connect, &host) || hSession->connection.sock < 0)
 	{
 		lib3270_autoptr(char) message = lib3270_strdup_printf(_( "Can't connect to %s"), lib3270_get_url(hSession));
@@ -326,7 +326,7 @@ int net_reconnect(H3270 *hSession, int seconds)
 	WSASetLastError(0);
 	int optval = lib3270_get_toggle(hSession,LIB3270_TOGGLE_KEEP_ALIVE) ? 1 : 0;
-	if (setsockopt(hSession->sock, SOL_SOCKET, SO_KEEPALIVE, (char *)&optval, sizeof(optval)) < 0)
+	if (setsockopt(hSession->connection.sock, SOL_SOCKET, SO_KEEPALIVE, (char *)&optval, sizeof(optval)) < 0)
 	{
 		char buffer[4096];
 		snprintf(buffer,4095,N_( "Can't %s network keep-alive" ), optval ? _( "enable" ) : _( "disable" ));
@@ -345,7 +345,7 @@ int net_reconnect(H3270 *hSession, int seconds)
 	}
 	optval = 1;
-	if (setsockopt(hSession->sock, SOL_SOCKET, SO_OOBINLINE, (char *)&optval,sizeof(optval)) < 0)
+	if (setsockopt(hSession->connection.sock, SOL_SOCKET, SO_OOBINLINE, (char *)&optval,sizeof(optval)) < 0)
 	{
 		lib3270_popup_dialog(	hSession,
 								LIB3270_NOTIFY_ERROR,
@@ -356,25 +356,11 @@ int net_reconnect(H3270 *hSession, int seconds)
 		return errno = ENOTCONN;
 	}
-	// set options for inline out-of-band data and keepalives
-
-	/*
-#if defined(OMTU)
-	else if (setsockopt(hSession->sock, SOL_SOCKET, SO_SNDBUF, (char *)&mtu,sizeof(mtu)) < 0)
-	{
-		popup_a_sockerr(hSession, N_( "setsockopt(%s)" ), "SO_SNDBUF");
-		SOCK_CLOSE(hSession);
-	}
-#endif
-
-	*/
-
 	// Connecting, set callbacks, wait for connection
-	hSession->cstate = LIB3270_PENDING;
+	lib3270_set_cstate(hSession, LIB3270_PENDING);
 	lib3270_st_changed(hSession, LIB3270_STATE_HALF_CONNECT, True);
-	hSession->xio.write = lib3270_add_poll_fd(hSession,hSession->sock,LIB3270_IO_FLAG_WRITE,net_connected,0);
-	// hSession->ns_write_id = AddOutput(hSession->sock, hSession, net_connected);
+	hSession->xio.write = lib3270_add_poll_fd(hSession,hSession->connection.sock,LIB3270_IO_FLAG_WRITE,net_connected,0);
 	trace("%s: Connection in progress",__FUNCTION__);
@@ -386,7 +372,7 @@ int net_reconnect(H3270 *hSession, int seconds)
 		{
 			lib3270_main_iterate(hSession,1);
-			switch(hSession->cstate)
+			switch(hSession->connection.state)
 			{
 			case LIB3270_PENDING:
 			case LIB3270_CONNECTED_INITIAL:
@@ -405,7 +391,7 @@ int net_reconnect(H3270 *hSession, int seconds)
 				return 0;
 			default:
-				lib3270_write_log(hSession,"connect", "%s: State changed to unexpected state %d",__FUNCTION__,hSession->cstate);
+				lib3270_write_log(hSession,"connect", "%s: State changed to unexpected state %d",__FUNCTION__,hSession->connection.state);
 				return -1;
 			}
	@@ -531,7 +531,7 @@ int non_blocking(H3270 *hSession, Boolean on)		@@ -531,7 +531,7 @@ int non_blocking(H3270 *hSession, Boolean on)
531	WSASetLastError(0);	531	WSASetLastError(0);
532	u_long iMode= on ? 1 : 0;	532	u_long iMode= on ? 1 : 0;
533		533
534	- if(ioctlsocket(hSession->sock,FIONBIO,&iMode))	534	+ if(ioctlsocket(hSession->connection.sock,FIONBIO,&iMode))
535	{	535	{
536	lib3270_popup_dialog( hSession,	536	lib3270_popup_dialog( hSession,
537	LIB3270_NOTIFY_ERROR,	537	LIB3270_NOTIFY_ERROR,