X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32sck.c;h=051b442bd41287a905b1aa8606ee22a80fca6879;hb=ca732855658630b07dee4aa9ea6ae952226bd828;hp=5c2b73f95a6a535e80e69cf34df0415d0332c949;hpb=c69f6586a27b86846a13e0177336730d72b33c95;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/win32sck.c b/win32/win32sck.c index 5c2b73f..051b442 100644 --- a/win32/win32sck.c +++ b/win32/win32sck.c @@ -11,19 +11,17 @@ #define WIN32IO_IS_STDIO #define WIN32SCK_IS_STDSCK #define WIN32_LEAN_AND_MEAN +#define PERLIO_NOT_STDIO 0 #ifdef __GNUC__ #define Win32_Winsock #endif #include +#include + #include "EXTERN.h" #include "perl.h" -#if defined(PERL_OBJECT) -#define NO_XSLOCKS -extern CPerlObj* pPerl; -#include "XSUB.h" -#endif - +#include "Win32iop.h" #include #include #include @@ -32,24 +30,29 @@ extern CPerlObj* pPerl; /* thanks to Beverly Brown (beverly@datacube.com) */ #ifdef USE_SOCKETS_AS_HANDLES -# define OPEN_SOCKET(x) _open_osfhandle(x,O_RDWR|O_BINARY) +# 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 */ +#if defined(USE_ITHREADS) #define StartSockets() \ STMT_START { \ if (!wsock_started) \ start_sockets(); \ + set_socktype(); \ } STMT_END - -#define EndSockets() \ +#else +#define StartSockets() \ STMT_START { \ - if (wsock_started) \ - WSACleanup(); \ + if (!wsock_started) { \ + start_sockets(); \ + set_socktype(); \ + } \ } STMT_END +#endif #define SOCKET_TEST(x, y) \ STMT_START { \ @@ -64,48 +67,42 @@ static struct servent* win32_savecopyservent(struct servent*d, struct servent*s, const char *proto); -#ifdef USE_THREADS -#ifdef USE_DECLSPEC_THREAD -__declspec(thread) struct servent myservent; -#else -#define myservent (thr->i.Wservent) -#endif -#else -static struct servent myservent; -#endif - static int wsock_started = 0; +EXTERN_C void +EndSockets(void) +{ + if (wsock_started) + WSACleanup(); +} + void start_sockets(void) { + dTHX; unsigned short version; WSADATA retdata; int ret; - int iSockOpt = SO_SYNCHRONOUS_NONALERT; /* * initalize the winsock interface and insure that it is * cleaned up at exit. */ - version = 0x101; + version = 0x2; if(ret = WSAStartup(version, &retdata)) - croak("Unable to locate winsock library!\n"); + 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 2.0 of winsock dll\n"); /* atexit((void (*)(void)) EndSockets); */ - -#ifdef USE_SOCKETS_AS_HANDLES - /* - * Enable the use of sockets as filehandles - */ - setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, - (char *)&iSockOpt, sizeof(iSockOpt)); -#endif /* USE_SOCKETS_AS_HANDLES */ wsock_started = 1; } +void +set_socktype(void) +{ +} + #ifndef USE_SOCKETS_AS_HANDLES #undef fdopen @@ -128,7 +125,7 @@ my_fdopen(int fd, char *mode) /* * If we get here, then fd is actually a socket. */ - Newz(1310, fp, 1, FILE); + Newz(1310, fp, 1, FILE); /* XXX leak, good thing this code isn't used */ if(fp == NULL) { errno = ENOMEM; return NULL; @@ -261,8 +258,15 @@ 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 = 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; } @@ -273,15 +277,18 @@ win32_select(int nfds, Perl_fd_set* rd, Perl_fd_set* wr, Perl_fd_set* ex, const int r; #ifdef USE_SOCKETS_AS_HANDLES Perl_fd_set dummy; - int i, fd, bit, offset; + int i, fd, save_errno = errno; 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)) { - Sleep(timeout->tv_sec * 1000 + - timeout->tv_usec / 1000); /* do the best we can */ + if (timeout) + Sleep(timeout->tv_sec * 1000 + + timeout->tv_usec / 1000); /* do the best we can */ + else + Sleep(UINT_MAX); return 0; } StartSockets(); @@ -305,14 +312,16 @@ win32_select(int nfds, Perl_fd_set* rd, Perl_fd_set* wr, Perl_fd_set* ex, const for (i = 0; i < nfds; i++) { fd = TO_SOCKET(i); if (PERL_FD_ISSET(i,rd)) - FD_SET(fd, &nrd); + FD_SET((unsigned)fd, &nrd); if (PERL_FD_ISSET(i,wr)) - FD_SET(fd, &nwr); + FD_SET((unsigned)fd, &nwr); if (PERL_FD_ISSET(i,ex)) - FD_SET(fd, &nex); + FD_SET((unsigned)fd, &nex); } + errno = save_errno; SOCKET_TEST_ERROR(r = select(nfds, prd, pwr, pex, timeout)); + save_errno = errno; for (i = 0; i < nfds; i++) { fd = TO_SOCKET(i); @@ -323,6 +332,7 @@ win32_select(int nfds, Perl_fd_set* rd, Perl_fd_set* wr, Perl_fd_set* ex, const if (PERL_FD_ISSET(i,ex) && !FD_ISSET(fd, &nex)) PERL_FD_CLR(i,ex); } + errno = save_errno; #else SOCKET_TEST_ERROR(r = select(nfds, rd, wr, ex, timeout)); #endif @@ -375,6 +385,71 @@ win32_closesocket(SOCKET s) return r; } +#ifdef USE_SOCKETS_AS_HANDLES +#define WIN32_OPEN_SOCKET(af, type, protocol) open_ifs_socket(af, type, protocol) + +void +convert_proto_info_w2a(WSAPROTOCOL_INFOW *in, WSAPROTOCOL_INFOA *out) +{ + Copy(in, out, 1, WSAPROTOCOL_INFOA); + wcstombs(out->szProtocol, in->szProtocol, sizeof(out->szProtocol)); +} + +SOCKET +open_ifs_socket(int af, int type, int protocol) +{ + dTHX; + char *s; + unsigned long proto_buffers_len = 0; + int error_code; + SOCKET out = INVALID_SOCKET; + + if ((s = PerlEnv_getenv("PERL_ALLOW_NON_IFS_LSP")) && atoi(s)) + return WSASocket(af, type, protocol, NULL, 0, 0); + + if (WSCEnumProtocols(NULL, NULL, &proto_buffers_len, &error_code) == SOCKET_ERROR + && error_code == WSAENOBUFS) + { + WSAPROTOCOL_INFOW *proto_buffers; + int protocols_available = 0; + + New(1, proto_buffers, proto_buffers_len / sizeof(WSAPROTOCOL_INFOW), + WSAPROTOCOL_INFOW); + + if ((protocols_available = WSCEnumProtocols(NULL, proto_buffers, + &proto_buffers_len, &error_code)) != SOCKET_ERROR) + { + int i; + for (i = 0; i < protocols_available; i++) + { + WSAPROTOCOL_INFOA proto_info; + + if ((af != AF_UNSPEC && af != proto_buffers[i].iAddressFamily) + || (type != proto_buffers[i].iSocketType) + || (protocol != 0 && proto_buffers[i].iProtocol != 0 && + protocol != proto_buffers[i].iProtocol)) + continue; + + if ((proto_buffers[i].dwServiceFlags1 & XP1_IFS_HANDLES) == 0) + continue; + + convert_proto_info_w2a(&(proto_buffers[i]), &proto_info); + + out = WSASocket(af, type, protocol, &proto_info, 0, 0); + break; + } + } + + Safefree(proto_buffers); + } + + return out; +} + +#else +#define WIN32_OPEN_SOCKET(af, type, protocol) socket(af, type, protocol) +#endif + SOCKET win32_socket(int af, int type, int protocol) { @@ -384,7 +459,8 @@ win32_socket(int af, int type, int protocol) SOCKET_TEST(s = socket(af, type, protocol), INVALID_SOCKET); #else StartSockets(); - if((s = socket(af, type, protocol)) == INVALID_SOCKET) + + if((s = WIN32_OPEN_SOCKET(af, type, protocol)) == INVALID_SOCKET) errno = WSAGetLastError(); else s = OPEN_SOCKET(s); @@ -393,22 +469,126 @@ win32_socket(int af, int type, int protocol) return s; } +/* + * close RTL fd while respecting sockets + * added as temporary measure until PerlIO has real + * Win32 native layer + * -- BKS, 11-11-2000 +*/ + +int my_close(int fd) +{ + int osf; + if (!wsock_started) /* No WinSock? */ + return(close(fd)); /* Then not a socket. */ + osf = TO_SOCKET(fd);/* Get it now before it's gone! */ + if (osf != -1) { + int err; + err = closesocket(osf); + if (err == 0) { +#if defined(USE_FIXED_OSFHANDLE) || defined(PERL_MSVCRT_READFIX) + _set_osfhnd(fd, INVALID_HANDLE_VALUE); +#endif + (void)close(fd); /* handle already closed, ignore error */ + return 0; + } + else if (err == SOCKET_ERROR) { + err = WSAGetLastError(); + if (err != WSAENOTSOCK) { + (void)close(fd); + errno = err; + return EOF; + } + } + } + return close(fd); +} + #undef fclose int my_fclose (FILE *pf) { - int osf, retval; + int osf; 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; + osf = TO_SOCKET(win32_fileno(pf));/* Get it now before it's gone! */ + if (osf != -1) { + int err; + win32_fflush(pf); + err = closesocket(osf); + if (err == 0) { +#if defined(USE_FIXED_OSFHANDLE) || defined(PERL_MSVCRT_READFIX) + _set_osfhnd(win32_fileno(pf), INVALID_HANDLE_VALUE); +#endif + (void)fclose(pf); /* handle already closed, ignore error */ + return 0; + } + else if (err == SOCKET_ERROR) { + err = WSAGetLastError(); + if (err != WSAENOTSOCK) { + (void)fclose(pf); + errno = err; + return EOF; + } + } } - return retval; + return fclose(pf); +} + +#undef fstat +int +my_fstat(int fd, Stat_t *sbufptr) +{ + /* This fixes a bug in fstat() on Windows 9x. fstat() uses the + * GetFileType() win32 syscall, which will fail on Windows 9x. + * So if we recognize a socket on Windows 9x, we return the + * same results as on Windows NT/2000. + * XXX this should be extended further to set S_IFSOCK on + * sbufptr->st_mode. + */ + int osf; + if (!wsock_started || IsWinNT()) { +#if defined(WIN64) || defined(USE_LARGE_FILES) +#if defined(__BORLANDC__) /* buk */ + return win32_fstat(fd, sbufptr ); +#else + return _fstati64(fd, sbufptr); +#endif +#else + return fstat(fd, sbufptr); +#endif + } + + osf = TO_SOCKET(fd); + if (osf != -1) { + char sockbuf[256]; + int optlen = sizeof(sockbuf); + int retval; + + retval = getsockopt((SOCKET)osf, SOL_SOCKET, SO_TYPE, sockbuf, &optlen); + if (retval != SOCKET_ERROR || WSAGetLastError() != WSAENOTSOCK) { +#if defined(__BORLANDC__)&&(__BORLANDC__<=0x520) + sbufptr->st_mode = S_IFIFO; +#else + sbufptr->st_mode = _S_IFIFO; +#endif + sbufptr->st_rdev = sbufptr->st_dev = (dev_t)fd; + sbufptr->st_nlink = 1; + sbufptr->st_uid = sbufptr->st_gid = sbufptr->st_ino = 0; + sbufptr->st_atime = sbufptr->st_mtime = sbufptr->st_ctime = 0; + sbufptr->st_size = (Off_t)0; + return 0; + } + } +#if defined(WIN64) || defined(USE_LARGE_FILES) +#if defined(__BORLANDC__) /* buk */ + return win32_fstat(fd, sbufptr ); +#else + return _fstati64(fd, sbufptr); +#endif +#else + return fstat(fd, sbufptr); +#endif } struct hostent * @@ -459,12 +639,12 @@ win32_getprotobynumber(int num) struct servent * win32_getservbyname(const char *name, const char *proto) { + dTHX; struct servent *r; - dTHR; SOCKET_TEST(r = getservbyname(name, proto), NULL); if (r) { - r = win32_savecopyservent(&myservent, r, proto); + r = win32_savecopyservent(&w32_servent, r, proto); } return r; } @@ -472,12 +652,12 @@ win32_getservbyname(const char *name, const char *proto) struct servent * win32_getservbyport(int port, const char *proto) { + dTHX; struct servent *r; - dTHR; SOCKET_TEST(r = getservbyport(port, proto), NULL); if (r) { - r = win32_savecopyservent(&myservent, r, proto); + r = win32_savecopyservent(&w32_servent, r, proto); } return r; } @@ -485,18 +665,19 @@ win32_getservbyport(int port, const char *proto) int win32_ioctl(int i, unsigned int u, char *data) { + dTHX; u_long argp = (u_long)data; int retval; if (!wsock_started) { - croak("ioctl implemented only on sockets"); + Perl_croak_nocontext("ioctl implemented only on sockets"); /* NOTREACHED */ } retval = ioctlsocket(TO_SOCKET(i), (long)u, &argp); if (retval == SOCKET_ERROR) { if (WSAGetLastError() == WSAENOTSOCK) { - croak("ioctl implemented only on sockets"); + Perl_croak_nocontext("ioctl implemented only on sockets"); /* NOTREACHED */ } errno = WSAGetLastError(); @@ -525,88 +706,101 @@ win32_inet_addr(const char FAR *cp) void win32_endhostent() { - croak("endhostent not implemented!\n"); + dTHX; + Perl_croak_nocontext("endhostent not implemented!\n"); } void win32_endnetent() { - croak("endnetent not implemented!\n"); + dTHX; + Perl_croak_nocontext("endnetent not implemented!\n"); } void win32_endprotoent() { - croak("endprotoent not implemented!\n"); + dTHX; + Perl_croak_nocontext("endprotoent not implemented!\n"); } void win32_endservent() { - croak("endservent not implemented!\n"); + dTHX; + Perl_croak_nocontext("endservent not implemented!\n"); } struct netent * win32_getnetent(void) { - croak("getnetent not implemented!\n"); + dTHX; + Perl_croak_nocontext("getnetent not implemented!\n"); return (struct netent *) NULL; } struct netent * win32_getnetbyname(char *name) { - croak("getnetbyname not implemented!\n"); + dTHX; + Perl_croak_nocontext("getnetbyname not implemented!\n"); return (struct netent *)NULL; } struct netent * win32_getnetbyaddr(long net, int type) { - croak("getnetbyaddr not implemented!\n"); + dTHX; + Perl_croak_nocontext("getnetbyaddr not implemented!\n"); return (struct netent *)NULL; } struct protoent * win32_getprotoent(void) { - croak("getprotoent not implemented!\n"); + dTHX; + Perl_croak_nocontext("getprotoent not implemented!\n"); return (struct protoent *) NULL; } struct servent * win32_getservent(void) { - croak("getservent not implemented!\n"); + dTHX; + Perl_croak_nocontext("getservent not implemented!\n"); return (struct servent *) NULL; } void win32_sethostent(int stayopen) { - croak("sethostent not implemented!\n"); + dTHX; + Perl_croak_nocontext("sethostent not implemented!\n"); } void win32_setnetent(int stayopen) { - croak("setnetent not implemented!\n"); + dTHX; + Perl_croak_nocontext("setnetent not implemented!\n"); } void win32_setprotoent(int stayopen) { - croak("setprotoent not implemented!\n"); + dTHX; + Perl_croak_nocontext("setprotoent not implemented!\n"); } void win32_setservent(int stayopen) { - croak("setservent not implemented!\n"); + dTHX; + Perl_croak_nocontext("setservent not implemented!\n"); } static struct servent*