X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32sck.c;h=49d38f33f14253017aed01e2c9124144b3370bb6;hb=c5be433b5c5658093bc9cae4434721a0b63e7a85;hp=7acb02871ca2af8448c30be3904ebf351f0d503a;hpb=68dc074516a6859e3424b48d1647bcb08b1a1a7d;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/win32sck.c b/win32/win32sck.c index 7acb028..49d38f3 100644 --- a/win32/win32sck.c +++ b/win32/win32sck.c @@ -1,4 +1,4 @@ -/* NTSock.C +/* win32sck.c * * (c) 1995 Microsoft Corporation. All rights reserved. * Developed by hip communications inc., http://info.hip.com/info/ @@ -8,358 +8,153 @@ * License or the Artistic License, as specified in the README file. */ -#include +#define WIN32IO_IS_STDIO +#define WIN32SCK_IS_STDSCK #define WIN32_LEAN_AND_MEAN +#ifdef __GNUC__ +#define Win32_Winsock +#endif +#include #include "EXTERN.h" #include "perl.h" + +#if defined(PERL_OBJECT) +#define NO_XSLOCKS +#include "XSUB.h" +#endif + +#include "Win32iop.h" #include #include #include #include +#include -#define CROAK croak - -#ifdef USE_SOCKETS_AS_HANDLES /* thanks to Beverly Brown (beverly@datacube.com) */ - -# if defined(_WIN32) && !defined(WIN95_OSFHANDLE_FIXED) && defined(_M_IX86) -/*# define OPEN_SOCKET(x) _patch_open_osfhandle(x, _O_RDWR | _O_BINARY) */ -# define OPEN_SOCKET(x) _open_osfhandle(x,_O_RDWR|_O_BINARY) -# else -# define OPEN_SOCKET(x) _open_osfhandle(x,_O_RDWR|_O_BINARY) -# endif -# define TO_SOCKET(x) _get_osfhandle(x) - +#ifdef USE_SOCKETS_AS_HANDLES +# define OPEN_SOCKET(x) win32_open_osfhandle(x,O_RDWR|O_BINARY) +# define TO_SOCKET(x) _get_osfhandle(x) #else - # define OPEN_SOCKET(x) (x) # define TO_SOCKET(x) (x) - #endif /* USE_SOCKETS_AS_HANDLES */ -/* - * This is a clone of fdopen so that we can handle the version of - * sockets that NT gets to use. - * - * The problem is that sockets are not real file handles and - * cannot be fdopen'ed. This causes problems in the do_socket - * routine in doio.c, since it tries to create two file pointers - * for the socket just created. We'll fake out an fdopen and see - * if we can prevent perl from trying to do stdio on sockets. - */ - -#if defined(_WIN32) && !defined(WIN95_OSFHANDLE_FIXED) && defined(_M_IX86) - -# ifdef __cplusplus -#define EXT_C_FUNC extern "C" -# else -#define EXT_C_FUNC extern -# endif - -EXT_C_FUNC int __cdecl _alloc_osfhnd(void); -EXT_C_FUNC int __cdecl _set_osfhnd(int fh, long value); -EXT_C_FUNC void __cdecl _lock_fhandle(int); -EXT_C_FUNC void __cdecl _unlock_fhandle(int); -EXT_C_FUNC void __cdecl _unlock(int); -EXT_C_FUNC struct servent* win32_savecopyservent(struct servent*d, - struct servent*s, const char *proto); - -#if (_MSC_VER >= 1000) -typedef struct { - long osfhnd; /* underlying OS file HANDLE */ - char osfile; /* attributes of file (e.g., open in text mode?) */ - char pipech; /* one char buffer for handles opened on pipes */ -#if defined (_MT) && !defined (DLL_FOR_WIN32S) - int lockinitflag; - CRITICAL_SECTION lock; -#endif /* defined (_MT) && !defined (DLL_FOR_WIN32S) */ -} ioinfo; - -EXT_C_FUNC ioinfo * __pioinfo[]; - -#define IOINFO_L2E 5 -#define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E) -#define _pioinfo(i) (__pioinfo[i >> IOINFO_L2E] + (i & (IOINFO_ARRAY_ELTS - 1))) -#define _osfile(i) (_pioinfo(i)->osfile) -#else /* (_MSC_VER >= 1000) */ - extern char _osfile[]; -#endif /* (_MSC_VER >= 1000) */ - -#define FOPEN 0x01 /* file handle open */ -#define FAPPEND 0x20 /* file handle opened O_APPEND */ -#define FDEV 0x40 /* file handle refers to device */ -#define FTEXT 0x80 /* file handle is in text mode */ - -#define _STREAM_LOCKS 26 /* Table of stream locks */ -#define _LAST_STREAM_LOCK (_STREAM_LOCKS+_NSTREAM_-1) /* Last stream lock */ -#define _FH_LOCKS (_LAST_STREAM_LOCK+1) /* Table of fh locks */ - -/*** -*int _patch_open_osfhandle(long osfhandle, int flags) - open C Runtime file handle -* -*Purpose: -* This function allocates a free C Runtime file handle and associates -* it with the Win32 HANDLE specified by the first parameter. This is a -* temperary fix for WIN95's brain damage GetFileType() error on socket -* we just bypass that call for socket -* -*Entry: -* long osfhandle - Win32 HANDLE to associate with C Runtime file handle. -* int flags - flags to associate with C Runtime file handle. -* -*Exit: -* returns index of entry in fh, if successful -* return -1, if no free entry is found -* -*Exceptions: -* -*******************************************************************************/ - -int __cdecl -_patch_open_osfhandle(long osfhandle, int flags) -{ - int fh; - char fileflags; /* _osfile flags */ - - /* copy relevant flags from second parameter */ - fileflags = FDEV; - - if(flags & _O_APPEND) - fileflags |= FAPPEND; - - if(flags & _O_TEXT) - fileflags |= FTEXT; - - /* attempt to allocate a C Runtime file handle */ - if((fh = _alloc_osfhnd()) == -1) { - errno = EMFILE; /* too many open files */ - _doserrno = 0L; /* not an OS error */ - return -1; /* return error to caller */ - } - - /* the file is open. now, set the info in _osfhnd array */ - _set_osfhnd(fh, osfhandle); - - fileflags |= FOPEN; /* mark as open */ - -#if (_MSC_VER >= 1000) - _osfile(fh) = fileflags; /* set osfile entry */ - _unlock_fhandle(fh); +#ifdef USE_THREADS +#define StartSockets() \ + STMT_START { \ + if (!wsock_started) \ + start_sockets(); \ + set_socktype(); \ + } STMT_END #else - _osfile[fh] = fileflags; /* set osfile entry */ - _unlock(fh+_FH_LOCKS); /* unlock handle */ +#define StartSockets() \ + STMT_START { \ + if (!wsock_started) { \ + start_sockets(); \ + set_socktype(); \ + } \ + } STMT_END #endif - return fh; /* return handle */ -} -#endif /* _M_IX86 */ - -#define SOCKETAPI PASCAL - -typedef SOCKET (SOCKETAPI *LPSOCKACCEPT)(SOCKET, struct sockaddr *, int *); -typedef int (SOCKETAPI *LPSOCKBIND)(SOCKET, const struct sockaddr *, int); -typedef int (SOCKETAPI *LPSOCKCLOSESOCKET)(SOCKET); -typedef int (SOCKETAPI *LPSOCKCONNECT)(SOCKET, const struct sockaddr *, int); -typedef int (SOCKETAPI *LPSOCKIOCTLSOCKET)(SOCKET, long, u_long *); -typedef int (SOCKETAPI *LPSOCKGETPEERNAME)(SOCKET, struct sockaddr *, int *); -typedef int (SOCKETAPI *LPSOCKGETSOCKNAME)(SOCKET, struct sockaddr *, int *); -typedef int (SOCKETAPI *LPSOCKGETSOCKOPT)(SOCKET, int, int, char *, int *); -typedef u_long (SOCKETAPI *LPSOCKHTONL)(u_long); -typedef u_short (SOCKETAPI *LPSOCKHTONS)(u_short); -typedef int (SOCKETAPI *LPSOCKLISTEN)(SOCKET, int); -typedef u_long (SOCKETAPI *LPSOCKNTOHL)(u_long); -typedef u_short (SOCKETAPI *LPSOCKNTOHS)(u_short); -typedef int (SOCKETAPI *LPSOCKRECV)(SOCKET, char *, int, int); -typedef int (SOCKETAPI *LPSOCKRECVFROM)(SOCKET, char *, int, int, struct sockaddr *, int *); -typedef int (SOCKETAPI *LPSOCKSELECT)(int, fd_set *, fd_set *, fd_set *, const struct timeval *); -typedef int (SOCKETAPI *LPSOCKSEND)(SOCKET, const char *, int, int); -typedef int (SOCKETAPI *LPSOCKSENDTO)(SOCKET, const char *, int, int, const struct sockaddr *, int); -typedef int (SOCKETAPI *LPSOCKSETSOCKOPT)(SOCKET, int, int, const char *, int); -typedef int (SOCKETAPI *LPSOCKSHUTDOWN)(SOCKET, int); -typedef SOCKET (SOCKETAPI *LPSOCKSOCKET)(int, int, int); -typedef char FAR *(SOCKETAPI *LPSOCKINETNTOA)(struct in_addr in); -typedef unsigned long (SOCKETAPI *LPSOCKINETADDR)(const char FAR * cp); - - -/* Database function prototypes */ -typedef struct hostent *(SOCKETAPI *LPSOCKGETHOSTBYADDR)(const char *, int, int); -typedef struct hostent *(SOCKETAPI *LPSOCKGETHOSTBYNAME)(const char *); -typedef int (SOCKETAPI *LPSOCKGETHOSTNAME)(char *, int); -typedef struct servent *(SOCKETAPI *LPSOCKGETSERVBYPORT)(int, const char *); -typedef struct servent *(SOCKETAPI *LPSOCKGETSERVBYNAME)(const char *, const char *); -typedef struct protoent *(SOCKETAPI *LPSOCKGETPROTOBYNUMBER)(int); -typedef struct protoent *(SOCKETAPI *LPSOCKGETPROTOBYNAME)(const char *); - -/* Microsoft Windows Extension function prototypes */ -typedef int (SOCKETAPI *LPSOCKWSASTARTUP)(unsigned short, LPWSADATA); -typedef int (SOCKETAPI *LPSOCKWSACLEANUP)(void); -typedef int (SOCKETAPI *LPSOCKWSAGETLASTERROR)(void); -typedef int (SOCKETAPI *LPWSAFDIsSet)(SOCKET, fd_set *); - -static HINSTANCE hWinSockDll = 0; -/* extern CRITICAL_SECTION csSock; */ - -static LPSOCKACCEPT paccept = 0; -static LPSOCKBIND pbind = 0; -static LPSOCKCLOSESOCKET pclosesocket = 0; -static LPSOCKCONNECT pconnect = 0; -static LPSOCKIOCTLSOCKET pioctlsocket = 0; -static LPSOCKGETPEERNAME pgetpeername = 0; -static LPSOCKGETSOCKNAME pgetsockname = 0; -static LPSOCKGETSOCKOPT pgetsockopt = 0; -static LPSOCKHTONL phtonl = 0; -static LPSOCKHTONS phtons = 0; -static LPSOCKLISTEN plisten = 0; -static LPSOCKNTOHL pntohl = 0; -static LPSOCKNTOHS pntohs = 0; -static LPSOCKRECV precv = 0; -static LPSOCKRECVFROM precvfrom = 0; -static LPSOCKSELECT pselect = 0; -static LPSOCKSEND psend = 0; -static LPSOCKSENDTO psendto = 0; -static LPSOCKSETSOCKOPT psetsockopt = 0; -static LPSOCKSHUTDOWN pshutdown = 0; -static LPSOCKSOCKET psocket = 0; -static LPSOCKGETHOSTBYADDR pgethostbyaddr = 0; -static LPSOCKGETHOSTBYNAME pgethostbyname = 0; -static LPSOCKGETHOSTNAME pgethostname = 0; -static LPSOCKGETSERVBYPORT pgetservbyport = 0; -static LPSOCKGETSERVBYNAME pgetservbyname = 0; -static LPSOCKGETPROTOBYNUMBER pgetprotobynumber = 0; -static LPSOCKGETPROTOBYNAME pgetprotobyname = 0; -static LPSOCKWSASTARTUP pWSAStartup = 0; -static LPSOCKWSACLEANUP pWSACleanup = 0; -static LPSOCKWSAGETLASTERROR pWSAGetLastError = 0; -static LPWSAFDIsSet pWSAFDIsSet = 0; -static LPSOCKINETNTOA pinet_ntoa = 0; -static LPSOCKINETADDR pinet_addr = 0; +#define EndSockets() \ + STMT_START { \ + if (wsock_started) \ + WSACleanup(); \ + } STMT_END -__declspec(thread) struct servent myservent; +#define SOCKET_TEST(x, y) \ + STMT_START { \ + StartSockets(); \ + if((x) == (y)) \ + errno = WSAGetLastError(); \ + } STMT_END +#define SOCKET_TEST_ERROR(x) SOCKET_TEST(x, SOCKET_ERROR) -void * -GetAddress(HINSTANCE hInstance, char *lpFunctionName) -{ - char buffer[512]; - FARPROC proc = GetProcAddress(hInstance, lpFunctionName); - if(proc == 0) { - sprintf(buffer, "Unable to get address of %s in WSock32.dll", lpFunctionName); - CROAK(buffer); - } - return proc; -} +static struct servent* win32_savecopyservent(struct servent*d, + struct servent*s, + const char *proto); -void -LoadWinSock(void) -{ -/* EnterCriticalSection(&csSock); */ - if(hWinSockDll == NULL) { - HINSTANCE hLib = LoadLibrary("WSock32.DLL"); - if(hLib == NULL) - CROAK("Could not load WSock32.dll\n"); - - paccept = (LPSOCKACCEPT)GetAddress(hLib, "accept"); - pbind = (LPSOCKBIND)GetAddress(hLib, "bind"); - pclosesocket = (LPSOCKCLOSESOCKET)GetAddress(hLib, "closesocket"); - pconnect = (LPSOCKCONNECT)GetAddress(hLib, "connect"); - pioctlsocket = (LPSOCKIOCTLSOCKET)GetAddress(hLib, "ioctlsocket"); - pgetpeername = (LPSOCKGETPEERNAME)GetAddress(hLib, "getpeername"); - pgetsockname = (LPSOCKGETSOCKNAME)GetAddress(hLib, "getsockname"); - pgetsockopt = (LPSOCKGETSOCKOPT)GetAddress(hLib, "getsockopt"); - phtonl = (LPSOCKHTONL)GetAddress(hLib, "htonl"); - phtons = (LPSOCKHTONS)GetAddress(hLib, "htons"); - plisten = (LPSOCKLISTEN)GetAddress(hLib, "listen"); - pntohl = (LPSOCKNTOHL)GetAddress(hLib, "ntohl"); - pntohs = (LPSOCKNTOHS)GetAddress(hLib, "ntohs"); - precv = (LPSOCKRECV)GetAddress(hLib, "recv"); - precvfrom = (LPSOCKRECVFROM)GetAddress(hLib, "recvfrom"); - pselect = (LPSOCKSELECT)GetAddress(hLib, "select"); - psend = (LPSOCKSEND)GetAddress(hLib, "send"); - psendto = (LPSOCKSENDTO)GetAddress(hLib, "sendto"); - psetsockopt = (LPSOCKSETSOCKOPT)GetAddress(hLib, "setsockopt"); - pshutdown = (LPSOCKSHUTDOWN)GetAddress(hLib, "shutdown"); - psocket = (LPSOCKSOCKET)GetAddress(hLib, "socket"); - pgethostbyaddr = (LPSOCKGETHOSTBYADDR)GetAddress(hLib, "gethostbyaddr"); - pgethostbyname = (LPSOCKGETHOSTBYNAME)GetAddress(hLib, "gethostbyname"); - pgethostname = (LPSOCKGETHOSTNAME)GetAddress(hLib, "gethostname"); - pgetservbyport = (LPSOCKGETSERVBYPORT)GetAddress(hLib, "getservbyport"); - pgetservbyname = (LPSOCKGETSERVBYNAME)GetAddress(hLib, "getservbyname"); - pgetprotobynumber = (LPSOCKGETPROTOBYNUMBER)GetAddress(hLib, "getprotobynumber"); - pgetprotobyname = (LPSOCKGETPROTOBYNAME)GetAddress(hLib, "getprotobyname"); - pWSAStartup = (LPSOCKWSASTARTUP)GetAddress(hLib, "WSAStartup"); - pWSACleanup = (LPSOCKWSACLEANUP)GetAddress(hLib, "WSACleanup"); - pWSAGetLastError = (LPSOCKWSAGETLASTERROR)GetAddress(hLib, "WSAGetLastError"); - pWSAFDIsSet = (LPWSAFDIsSet)GetAddress(hLib, "__WSAFDIsSet"); - pinet_addr = (LPSOCKINETADDR)GetAddress(hLib,"inet_addr"); - pinet_ntoa = (LPSOCKINETNTOA)GetAddress(hLib,"inet_ntoa"); - - hWinSockDll = hLib; - } -/* LeaveCriticalSection(&csSock); */ -} +#ifdef USE_THREADS +#ifdef USE_DECLSPEC_THREAD +__declspec(thread) struct servent myservent; +__declspec(thread) int init_socktype; +#else +#define myservent (thr->i.Wservent) +#define init_socktype (thr->i.Winit_socktype) +#endif +#else +static struct servent myservent; +#endif -void -EndSockets(void) -{ - if(hWinSockDll != NULL) { - pWSACleanup(); - FreeLibrary(hWinSockDll); - } - hWinSockDll = NULL; -} +static int wsock_started = 0; void -StartSockets(void) +start_sockets(void) { + dTHXo; unsigned short version; WSADATA retdata; int ret; - int iSockOpt = SO_SYNCHRONOUS_NONALERT; - LoadWinSock(); /* * initalize the winsock interface and insure that it is * cleaned up at exit. */ version = 0x101; - if(ret = pWSAStartup(version, &retdata)) - CROAK("Unable to locate winsock library!\n"); + if(ret = WSAStartup(version, &retdata)) + Perl_croak_nocontext("Unable to locate winsock library!\n"); if(retdata.wVersion != version) - CROAK("Could not find version 1.1 of winsock dll\n"); + Perl_croak_nocontext("Could not find version 1.1 of winsock dll\n"); /* atexit((void (*)(void)) EndSockets); */ + wsock_started = 1; +} +void +set_socktype(void) +{ #ifdef USE_SOCKETS_AS_HANDLES +#ifdef USE_THREADS + dTHX; + if(!init_socktype) { +#endif + int iSockOpt = SO_SYNCHRONOUS_NONALERT; /* * Enable the use of sockets as filehandles */ - psetsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, + setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (char *)&iSockOpt, sizeof(iSockOpt)); +#ifdef USE_THREADS + init_socktype = 1; + } +#endif #endif /* USE_SOCKETS_AS_HANDLES */ } #ifndef USE_SOCKETS_AS_HANDLES +#undef fdopen FILE * -myfdopen(int fd, char *mode) +my_fdopen(int fd, char *mode) { FILE *fp; char sockbuf[256]; int optlen = sizeof(sockbuf); int retval; - if (hWinSockDll == 0) - LoadWinSock(); + if (!wsock_started) + return(fdopen(fd, mode)); - retval = pgetsockopt((SOCKET)fd, SOL_SOCKET, SO_TYPE, sockbuf, &optlen); - if(retval == SOCKET_ERROR && pWSAGetLastError() == WSAENOTSOCK) { - return(_fdopen(fd, mode)); + retval = getsockopt((SOCKET)fd, SOL_SOCKET, SO_TYPE, sockbuf, &optlen); + if(retval == SOCKET_ERROR && WSAGetLastError() == WSAENOTSOCK) { + return(fdopen(fd, mode)); } /* * If we get here, then fd is actually a socket. */ - Newz(1601, fp, 1, FILE); + Newz(1310, fp, 1, FILE); if(fp == NULL) { errno = ENOMEM; return NULL; @@ -379,51 +174,39 @@ myfdopen(int fd, char *mode) u_long win32_htonl(u_long hostlong) { - if(hWinSockDll == 0) - LoadWinSock(); - - return phtonl(hostlong); + StartSockets(); + return htonl(hostlong); } u_short win32_htons(u_short hostshort) { - if(hWinSockDll == 0) - LoadWinSock(); - - return phtons(hostshort); + StartSockets(); + return htons(hostshort); } u_long win32_ntohl(u_long netlong) { - if(hWinSockDll == 0) - LoadWinSock(); - - return pntohl(netlong); + StartSockets(); + return ntohl(netlong); } u_short win32_ntohs(u_short netshort) { - if(hWinSockDll == 0) - LoadWinSock(); - - return pntohs(netshort); + StartSockets(); + return ntohs(netshort); } -#define SOCKET_TEST(x, y) if(hWinSockDll == 0) StartSockets();\ - if((x) == (y)) errno = pWSAGetLastError() - -#define SOCKET_TEST_ERROR(x) SOCKET_TEST(x, SOCKET_ERROR) SOCKET win32_accept(SOCKET s, struct sockaddr *addr, int *addrlen) { SOCKET r; - SOCKET_TEST((r = paccept(TO_SOCKET(s), addr, addrlen)), INVALID_SOCKET); + SOCKET_TEST((r = accept(TO_SOCKET(s), addr, addrlen)), INVALID_SOCKET); return OPEN_SOCKET(r); } @@ -432,7 +215,7 @@ win32_bind(SOCKET s, const struct sockaddr *addr, int addrlen) { int r; - SOCKET_TEST_ERROR(r = pbind(TO_SOCKET(s), addr, addrlen)); + SOCKET_TEST_ERROR(r = bind(TO_SOCKET(s), addr, addrlen)); return r; } @@ -441,7 +224,7 @@ win32_connect(SOCKET s, const struct sockaddr *addr, int addrlen) { int r; - SOCKET_TEST_ERROR(r = pconnect(TO_SOCKET(s), addr, addrlen)); + SOCKET_TEST_ERROR(r = connect(TO_SOCKET(s), addr, addrlen)); return r; } @@ -451,7 +234,7 @@ win32_getpeername(SOCKET s, struct sockaddr *addr, int *addrlen) { int r; - SOCKET_TEST_ERROR(r = pgetpeername(TO_SOCKET(s), addr, addrlen)); + SOCKET_TEST_ERROR(r = getpeername(TO_SOCKET(s), addr, addrlen)); return r; } @@ -460,7 +243,7 @@ win32_getsockname(SOCKET s, struct sockaddr *addr, int *addrlen) { int r; - SOCKET_TEST_ERROR(r = pgetsockname(TO_SOCKET(s), addr, addrlen)); + SOCKET_TEST_ERROR(r = getsockname(TO_SOCKET(s), addr, addrlen)); return r; } @@ -469,7 +252,7 @@ win32_getsockopt(SOCKET s, int level, int optname, char *optval, int *optlen) { int r; - SOCKET_TEST_ERROR(r = pgetsockopt(TO_SOCKET(s), level, optname, optval, optlen)); + SOCKET_TEST_ERROR(r = getsockopt(TO_SOCKET(s), level, optname, optval, optlen)); return r; } @@ -478,7 +261,7 @@ win32_ioctlsocket(SOCKET s, long cmd, u_long *argp) { int r; - SOCKET_TEST_ERROR(r = pioctlsocket(TO_SOCKET(s), cmd, argp)); + SOCKET_TEST_ERROR(r = ioctlsocket(TO_SOCKET(s), cmd, argp)); return r; } @@ -487,7 +270,7 @@ win32_listen(SOCKET s, int backlog) { int r; - SOCKET_TEST_ERROR(r = plisten(TO_SOCKET(s), backlog)); + SOCKET_TEST_ERROR(r = listen(TO_SOCKET(s), backlog)); return r; } @@ -496,7 +279,7 @@ win32_recv(SOCKET s, char *buf, int len, int flags) { int r; - SOCKET_TEST_ERROR(r = precv(TO_SOCKET(s), buf, len, flags)); + SOCKET_TEST_ERROR(r = recv(TO_SOCKET(s), buf, len, flags)); return r; } @@ -504,20 +287,41 @@ int win32_recvfrom(SOCKET s, char *buf, int len, int flags, struct sockaddr *from, int *fromlen) { int r; + int frombufsize = *fromlen; - SOCKET_TEST_ERROR(r = precvfrom(TO_SOCKET(s), buf, len, flags, from, fromlen)); + SOCKET_TEST_ERROR(r = recvfrom(TO_SOCKET(s), buf, len, flags, from, fromlen)); + /* Winsock's recvfrom() only returns a valid 'from' when the socket + * is connectionless. Perl expects a valid 'from' for all types + * of sockets, so go the extra mile. + */ + if (r != SOCKET_ERROR && frombufsize == *fromlen) + (void)win32_getpeername(s, from, fromlen); return r; } /* select contributed by Vincent R. Slyngstad (vrs@ibeam.intel.com) */ int -win32_select(int nfds, int* rd, int* wr, int* ex, const struct timeval* timeout) +win32_select(int nfds, Perl_fd_set* rd, Perl_fd_set* wr, Perl_fd_set* ex, const struct timeval* timeout) { - long r; - int dummy = 0; + int r; +#ifdef USE_SOCKETS_AS_HANDLES + Perl_fd_set dummy; int i, fd, bit, offset; - FD_SET nrd, nwr, nex,*prd,*pwr,*pex; + FD_SET nrd, nwr, nex, *prd, *pwr, *pex; + /* winsock seems incapable of dealing with all three null fd_sets, + * so do the (millisecond) sleep as a special case + */ + if (!(rd || wr || ex)) { + if (timeout) + Sleep(timeout->tv_sec * 1000 + + timeout->tv_usec / 1000); /* do the best we can */ + else + Sleep(UINT_MAX); + return 0; + } + StartSockets(); + PERL_FD_ZERO(&dummy); if (!rd) rd = &dummy, prd = NULL; else @@ -536,35 +340,28 @@ win32_select(int nfds, int* rd, int* wr, int* ex, const struct timeval* timeout) FD_ZERO(&nex); for (i = 0; i < nfds; i++) { fd = TO_SOCKET(i); - bit = 1L<<(i % (sizeof(int)*8)); - offset = i / (sizeof(int)*8); - if (rd[offset] & bit) + if (PERL_FD_ISSET(i,rd)) FD_SET(fd, &nrd); - if (wr[offset] & bit) + if (PERL_FD_ISSET(i,wr)) FD_SET(fd, &nwr); - if (ex[offset] & bit) + if (PERL_FD_ISSET(i,ex)) FD_SET(fd, &nex); } - SOCKET_TEST_ERROR(r = pselect(nfds, prd, pwr, pex, timeout)); + SOCKET_TEST_ERROR(r = select(nfds, prd, pwr, pex, timeout)); for (i = 0; i < nfds; i++) { fd = TO_SOCKET(i); - bit = 1L<<(i % (sizeof(int)*8)); - offset = i / (sizeof(int)*8); - if (rd[offset] & bit) { - if (!pWSAFDIsSet(fd, &nrd)) - rd[offset] &= ~bit; - } - if (wr[offset] & bit) { - if (!pWSAFDIsSet(fd, &nwr)) - wr[offset] &= ~bit; - } - if (ex[offset] & bit) { - if (!pWSAFDIsSet(fd, &nex)) - ex[offset] &= ~bit; - } + if (PERL_FD_ISSET(i,rd) && !FD_ISSET(fd, &nrd)) + PERL_FD_CLR(i,rd); + if (PERL_FD_ISSET(i,wr) && !FD_ISSET(fd, &nwr)) + PERL_FD_CLR(i,wr); + if (PERL_FD_ISSET(i,ex) && !FD_ISSET(fd, &nex)) + PERL_FD_CLR(i,ex); } +#else + SOCKET_TEST_ERROR(r = select(nfds, rd, wr, ex, timeout)); +#endif return r; } @@ -573,7 +370,7 @@ win32_send(SOCKET s, const char *buf, int len, int flags) { int r; - SOCKET_TEST_ERROR(r = psend(TO_SOCKET(s), buf, len, flags)); + SOCKET_TEST_ERROR(r = send(TO_SOCKET(s), buf, len, flags)); return r; } @@ -583,7 +380,7 @@ win32_sendto(SOCKET s, const char *buf, int len, int flags, { int r; - SOCKET_TEST_ERROR(r = psendto(TO_SOCKET(s), buf, len, flags, to, tolen)); + SOCKET_TEST_ERROR(r = sendto(TO_SOCKET(s), buf, len, flags, to, tolen)); return r; } @@ -592,7 +389,7 @@ win32_setsockopt(SOCKET s, int level, int optname, const char *optval, int optle { int r; - SOCKET_TEST_ERROR(r = psetsockopt(TO_SOCKET(s), level, optname, optval, optlen)); + SOCKET_TEST_ERROR(r = setsockopt(TO_SOCKET(s), level, optname, optval, optlen)); return r; } @@ -601,7 +398,16 @@ win32_shutdown(SOCKET s, int how) { int r; - SOCKET_TEST_ERROR(r = pshutdown(TO_SOCKET(s), how)); + SOCKET_TEST_ERROR(r = shutdown(TO_SOCKET(s), how)); + return r; +} + +int +win32_closesocket(SOCKET s) +{ + int r; + + SOCKET_TEST_ERROR(r = closesocket(TO_SOCKET(s))); return r; } @@ -611,13 +417,11 @@ win32_socket(int af, int type, int protocol) SOCKET s; #ifndef USE_SOCKETS_AS_HANDLES - SOCKET_TEST(s = psocket(af, type, protocol), INVALID_SOCKET); + SOCKET_TEST(s = socket(af, type, protocol), INVALID_SOCKET); #else - if(hWinSockDll == 0) - StartSockets(); - - if((s = psocket(af, type, protocol)) == INVALID_SOCKET) - errno = pWSAGetLastError(); + StartSockets(); + if((s = socket(af, type, protocol)) == INVALID_SOCKET) + errno = WSAGetLastError(); else s = OPEN_SOCKET(s); #endif /* USE_SOCKETS_AS_HANDLES */ @@ -625,12 +429,30 @@ win32_socket(int af, int type, int protocol) return s; } +#undef fclose +int +my_fclose (FILE *pf) +{ + int osf, retval; + if (!wsock_started) /* No WinSock? */ + return(fclose(pf)); /* Then not a socket. */ + osf = TO_SOCKET(fileno(pf));/* Get it now before it's gone! */ + retval = fclose(pf); /* Must fclose() before closesocket() */ + if (osf != -1 + && closesocket(osf) == SOCKET_ERROR + && WSAGetLastError() != WSAENOTSOCK) + { + return EOF; + } + return retval; +} + struct hostent * win32_gethostbyaddr(const char *addr, int len, int type) { struct hostent *r; - SOCKET_TEST(r = pgethostbyaddr(addr, len, type), NULL); + SOCKET_TEST(r = gethostbyaddr(addr, len, type), NULL); return r; } @@ -639,7 +461,7 @@ win32_gethostbyname(const char *name) { struct hostent *r; - SOCKET_TEST(r = pgethostbyname(name), NULL); + SOCKET_TEST(r = gethostbyname(name), NULL); return r; } @@ -648,7 +470,7 @@ win32_gethostname(char *name, int len) { int r; - SOCKET_TEST_ERROR(r = pgethostname(name, len)); + SOCKET_TEST_ERROR(r = gethostname(name, len)); return r; } @@ -657,7 +479,7 @@ win32_getprotobyname(const char *name) { struct protoent *r; - SOCKET_TEST(r = pgetprotobyname(name), NULL); + SOCKET_TEST(r = getprotobyname(name), NULL); return r; } @@ -666,16 +488,17 @@ win32_getprotobynumber(int num) { struct protoent *r; - SOCKET_TEST(r = pgetprotobynumber(num), NULL); + SOCKET_TEST(r = getprotobynumber(num), NULL); return r; } struct servent * win32_getservbyname(const char *name, const char *proto) { + dTHXo; struct servent *r; - - SOCKET_TEST(r = pgetservbyname(name, proto), NULL); + + SOCKET_TEST(r = getservbyname(name, proto), NULL); if (r) { r = win32_savecopyservent(&myservent, r, proto); } @@ -685,125 +508,174 @@ win32_getservbyname(const char *name, const char *proto) struct servent * win32_getservbyport(int port, const char *proto) { + dTHXo; struct servent *r; - SOCKET_TEST(r = pgetservbyport(port, proto), NULL); + SOCKET_TEST(r = getservbyport(port, proto), NULL); if (r) { r = win32_savecopyservent(&myservent, r, proto); } return r; } +int +win32_ioctl(int i, unsigned int u, char *data) +{ + dTHXo; + u_long argp = (u_long)data; + int retval; + + if (!wsock_started) { + Perl_croak_nocontext("ioctl implemented only on sockets"); + /* NOTREACHED */ + } + + retval = ioctlsocket(TO_SOCKET(i), (long)u, &argp); + if (retval == SOCKET_ERROR) { + if (WSAGetLastError() == WSAENOTSOCK) { + Perl_croak_nocontext("ioctl implemented only on sockets"); + /* NOTREACHED */ + } + errno = WSAGetLastError(); + } + return retval; +} + char FAR * win32_inet_ntoa(struct in_addr in) { - if(hWinSockDll == 0) - LoadWinSock(); - - return pinet_ntoa(in); + StartSockets(); + return inet_ntoa(in); } unsigned long win32_inet_addr(const char FAR *cp) { - if(hWinSockDll == 0) - LoadWinSock(); - - return pinet_addr(cp); - + StartSockets(); + return inet_addr(cp); } /* * Networking stubs */ -#undef CROAK -#define CROAK croak void win32_endhostent() { - CROAK("endhostent not implemented!\n"); + dTHXo; + Perl_croak_nocontext("endhostent not implemented!\n"); } void win32_endnetent() { - CROAK("endnetent not implemented!\n"); + dTHXo; + Perl_croak_nocontext("endnetent not implemented!\n"); } void win32_endprotoent() { - CROAK("endprotoent not implemented!\n"); + dTHXo; + Perl_croak_nocontext("endprotoent not implemented!\n"); } void win32_endservent() { - CROAK("endservent not implemented!\n"); + dTHXo; + Perl_croak_nocontext("endservent not implemented!\n"); } struct netent * win32_getnetent(void) { - CROAK("getnetent not implemented!\n"); + dTHXo; + Perl_croak_nocontext("getnetent not implemented!\n"); return (struct netent *) NULL; } struct netent * win32_getnetbyname(char *name) { - CROAK("getnetbyname not implemented!\n"); + dTHXo; + Perl_croak_nocontext("getnetbyname not implemented!\n"); return (struct netent *)NULL; } struct netent * win32_getnetbyaddr(long net, int type) { - CROAK("getnetbyaddr not implemented!\n"); + dTHXo; + Perl_croak_nocontext("getnetbyaddr not implemented!\n"); return (struct netent *)NULL; } struct protoent * win32_getprotoent(void) { - CROAK("getprotoent not implemented!\n"); + dTHXo; + Perl_croak_nocontext("getprotoent not implemented!\n"); return (struct protoent *) NULL; } struct servent * win32_getservent(void) { - CROAK("getservent not implemented!\n"); + dTHXo; + Perl_croak_nocontext("getservent not implemented!\n"); return (struct servent *) NULL; } void win32_sethostent(int stayopen) { - CROAK("sethostent not implemented!\n"); + dTHXo; + Perl_croak_nocontext("sethostent not implemented!\n"); } void win32_setnetent(int stayopen) { - CROAK("setnetent not implemented!\n"); + dTHXo; + Perl_croak_nocontext("setnetent not implemented!\n"); } void win32_setprotoent(int stayopen) { - CROAK("setprotoent not implemented!\n"); + dTHXo; + Perl_croak_nocontext("setprotoent not implemented!\n"); } void win32_setservent(int stayopen) { - CROAK("setservent not implemented!\n"); + dTHXo; + Perl_croak_nocontext("setservent not implemented!\n"); +} + +static struct servent* +win32_savecopyservent(struct servent*d, struct servent*s, const char *proto) +{ + d->s_name = s->s_name; + d->s_aliases = s->s_aliases; + d->s_port = s->s_port; +#ifndef __BORLANDC__ /* Buggy on Win95 and WinNT-with-Borland-WSOCK */ + if (!IsWin95() && s->s_proto && strlen(s->s_proto)) + d->s_proto = s->s_proto; + else +#endif + if (proto && strlen(proto)) + d->s_proto = (char *)proto; + else + d->s_proto = "tcp"; + + return d; }