[JaMUDe-cvs] test/src montrey

[JaMUDe C. C. <jam...@li...>]

JaMUDe CVS commit

Author  : montrey
Tree    : test
Dir     : test/src


Modified Files:
	comm.cpp 


Log Message:
removed support for Win32
===================================================================
RCS file: /cvsroot/jamude/test/src/comm.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- comm.cpp	18 Oct 2002 00:48:45 -0000	1.3
+++ comm.cpp	18 Oct 2002 00:57:44 -0000	1.4
@@ -1,20 +1,10 @@
 #include "include/mud.h"
 
 
-#ifdef WIN32
-typedef int socklen_t;
-#endif
-
 Communication::Communication( int port ) {
     struct sockaddr_in sa;
     int x = 1;
-#ifdef WIN32
-    WORD wVersionRequested;
-    WSADATA wsaData;
 
-    wVersionRequested = MAKEWORD( 2, 0 );
-    WSAStartup ( wVersionRequested, &wsaData );
-#endif
     // We setup the socket and state that it is a TCP type socket
     // Failure means we couldn't get  a socket and we should bail
     if ( (listen_fd=socket(AF_INET,SOCK_STREAM, 0)) < 0 ) {
@@ -231,9 +221,6 @@
     int maxdesc = listen_fd, desc;
     static struct timeval timeout;
     struct sockaddr_in sock;
-#ifdef WIN32
-    unsigned long non_block=1;
-#endif
     Dnode *tmp;
     socklen_t size = 0;
 
@@ -255,11 +242,8 @@
 	    maxdesc = tmp->fd;
 	fd_list->next();
     }
-#ifdef WIN32
-    if ( select(0, &in_set, &out_set, (fd_set *) 0, &timeout) == -1 )
-#else
+
     if ( select(maxdesc+1, &in_set, &out_set, (fd_set *) 0, &timeout) == -1 )
-#endif
 	{
 	perror("Communication::accept_new_socket: select");
 	exit(-1);
@@ -269,17 +253,12 @@
 	    perror("Communication::accept_new_socket: accept");
 	    return;
 	}
-#ifndef WIN32
+
 	if ( fcntl(desc, F_SETFL, O_NONBLOCK) == -1 ) {
 	    perror("Communication::accept_new_socket: fcntl");
 	    return;
 	}
-#else
-	if ( ioctlsocket( desc, FIONBIO, &non_block) != 0 ) {
-		perror("Communication::accept_new_socket: ioctlsocket");
-		return;
-	}
-#endif
+
 	cout << "New connection on descriptor " << desc << endl;
 	tmp = new Dnode(desc);
 	fd_list->append(tmp);
@@ -309,11 +288,7 @@
 
     if ( !cursor->fd )
 	return;
-#ifdef WIN32
-	closesocket(cursor->fd);
-#else
     close(cursor->fd);
-#endif
     tmp = cursor->prev;
     delete cursor;
     cursor = tmp;
@@ -386,11 +361,7 @@
     while ( 1 ) {
 	comm->accept_new_socket();
 	comm->recv();
-#ifndef WIN32
 	usleep(250000);		// go easy on the cpu
-#else
-    Sleep(250);		// go easy on the cpu
-#endif
     }
 
     return 0;