#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 <sys/socket.h>
#include <fcntl.h>
#include <sys/stat.h>
-#ifndef __MINGW32__
#include <assert.h>
-#endif
#include <io.h>
/* thanks to Beverly Brown (beverly@datacube.com) */
STMT_START { \
if (!wsock_started) \
start_sockets(); \
- set_socktype(); \
+ set_socktype(); \
} STMT_END
#else
#define StartSockets() \
STMT_START { \
StartSockets(); \
if((x) == (y)) \
- errno = CALL(WSAGetLastError)(); \
+ errno = WSAGetLastError(); \
} STMT_END
#define SOCKET_TEST_ERROR(x) SOCKET_TEST(x, SOCKET_ERROR)
static int wsock_started = 0;
-#ifdef PERL_WIN32_SOCK_DLOAD /* we load the socket libraries when needed -- BKS 5-29-2000 */
-#define CALL(x) (*p ## x)
-typedef SOCKET (PASCAL *Paccept)(SOCKET,struct sockaddr*,int*);
-typedef int (PASCAL *Pbind)(SOCKET,const struct sockaddr*,int);
-typedef int (PASCAL *Pclosesocket)(SOCKET);
-typedef int (PASCAL *Pconnect)(SOCKET,const struct sockaddr*,int);
-typedef int (PASCAL *Pioctlsocket)(SOCKET,long,u_long *);
-typedef int (PASCAL *Pgetpeername)(SOCKET,struct sockaddr*,int*);
-typedef int (PASCAL *Pgetsockname)(SOCKET,struct sockaddr*,int*);
-typedef int (PASCAL *Pgetsockopt)(SOCKET,int,int,char*,int*);
-typedef unsigned long (PASCAL *Pinet_addr)(const char*);
-typedef char * (PASCAL *Pinet_ntoa)(struct in_addr);
-typedef int (PASCAL *Plisten)(SOCKET,int);
-typedef int (PASCAL *Precv)(SOCKET,char*,int,int);
-typedef int (PASCAL *Precvfrom)(SOCKET,char*,int,int,struct sockaddr*,int*);
-typedef int (PASCAL *Psend)(SOCKET,const char*,int,int);
-typedef int (PASCAL *Psendto)(SOCKET,const char*,int,int,const struct sockaddr*,int);
-typedef int (PASCAL *Psetsockopt)(SOCKET,int,int,const char*,int);
-typedef int (PASCAL *Pshutdown)(SOCKET,int);
-typedef SOCKET (PASCAL *Psocket)(int,int,int);
-typedef struct hostent* (PASCAL *Pgethostbyaddr)(const char*,int,int);
-typedef struct hostent* (PASCAL *Pgethostbyname)(const char*);
-typedef struct servent* (PASCAL *Pgetservbyport)(int,const char*);
-typedef struct servent* (PASCAL *Pgetservbyname)(const char*,const char*);
-typedef struct protoent* (PASCAL *Pgetprotobynumber)(int);
-typedef struct protoent* (PASCAL *Pgetprotobyname)(const char*);
-typedef int (PASCAL *PWSACleanup)(void);
-typedef int (PASCAL *PWSAStartup)(unsigned short, WSADATA*);
-typedef void (PASCAL *PWSASetLastError)(int);
-typedef int (PASCAL *PWSAGetLastError)(void);
-typedef int (PASCAL *P__WSAFDIsSet)(SOCKET,fd_set*);
-typedef int (PASCAL *Pselect)(int nfds,fd_set*,fd_set*,fd_set*,const struct timeval*);
-typedef int (PASCAL *Pgethostname)(char*,int);
-typedef u_long (PASCAL *Phtonl)(u_long), (PASCAL *Pntohl)(u_long);
-typedef u_short (PASCAL *Phtons)(u_short), (PASCAL *Pntohs)(u_short);
-static Paccept paccept;
-static Pbind pbind;
-static Pclosesocket pclosesocket;
-static Pconnect pconnect;
-static Pioctlsocket pioctlsocket;
-static Pgetpeername pgetpeername;
-static Pgetsockname pgetsockname;
-static Pgetsockopt pgetsockopt;
-static Pinet_addr pinet_addr;
-static Pinet_ntoa pinet_ntoa;
-static Plisten plisten;
-static Precv precv;
-static Precvfrom precvfrom;
-static Psend psend;
-static Psendto psendto;
-static Psetsockopt psetsockopt;
-static Pshutdown pshutdown;
-static Psocket psocket;
-static Pgethostbyaddr pgethostbyaddr;
-static Pgethostbyname pgethostbyname;
-static Pgetservbyport pgetservbyport;
-static Pgetservbyname pgetservbyname;
-static Pgetprotobynumber pgetprotobynumber;
-static Pgetprotobyname pgetprotobyname;
-static PWSAStartup pWSAStartup;
-static PWSACleanup pWSACleanup;
-static PWSASetLastError pWSASetLastError;
-static PWSAGetLastError pWSAGetLastError;
-static P__WSAFDIsSet p__WSAFDIsSet;
-static Pselect pselect;
-static Pgethostname pgethostname;
-#if BYTEORDER != 0x1234
-static Phtons phtons;
-static Pntohs pntohs;
-static Phtonl phtonl;
-static Pntohl pntohl;
-#endif
-void end_sockets(pTHXo_ void *ptr)
+EXTERN_C void
+EndSockets(void)
{
- CALL(WSACleanup)();
- wsock_started = 0;
- FreeLibrary(ptr);
+ if (wsock_started)
+ WSACleanup();
}
-#else
-#define CALL(x) x
-#endif /* PERL_WIN32_SOCK_DLOAD */
+
void
start_sockets(void)
{
unsigned short version;
WSADATA retdata;
int ret;
-#ifdef PERL_WIN32_SOCK_DLOAD
- HANDLE hDll = LoadLibraryA("wsock32.dll");
/*
* initalize the winsock interface and insure that it is
* cleaned up at exit.
- * Also, only load the DLL when needed -- BKS, 4-2-2000
*/
- if (!(hDll &&
- (paccept = (Paccept)GetProcAddress(hDll, "accept")) &&
- (pbind = (Pbind)GetProcAddress(hDll, "bind")) &&
- (pclosesocket = (Pclosesocket)GetProcAddress(hDll, "closesocket")) &&
- (pconnect = (Pconnect)GetProcAddress(hDll, "connect")) &&
- (pioctlsocket = (Pioctlsocket)GetProcAddress(hDll, "ioctlsocket")) &&
- (pgetpeername = (Pgetpeername)GetProcAddress(hDll, "getpeername")) &&
- (pgetsockname = (Pgetsockname)GetProcAddress(hDll, "getsockname")) &&
- (pgetsockopt = (Pgetsockopt)GetProcAddress(hDll, "getsockopt")) &&
- (pinet_addr = (Pinet_addr)GetProcAddress(hDll, "inet_addr")) &&
- (pinet_ntoa = (Pinet_ntoa)GetProcAddress(hDll, "inet_ntoa")) &&
- (plisten = (Plisten)GetProcAddress(hDll, "listen")) &&
- (precv = (Precv)GetProcAddress(hDll, "recv")) &&
- (precvfrom = (Precvfrom)GetProcAddress(hDll, "recvfrom")) &&
- (psend = (Psend)GetProcAddress(hDll, "send")) &&
- (psendto = (Psendto)GetProcAddress(hDll, "sendto")) &&
- (psetsockopt = (Psetsockopt)GetProcAddress(hDll, "setsockopt")) &&
- (pshutdown = (Pshutdown)GetProcAddress(hDll, "shutdown")) &&
- (psocket = (Psocket)GetProcAddress(hDll, "socket")) &&
- (pgethostbyaddr = (Pgethostbyaddr)GetProcAddress(hDll, "gethostbyaddr")) &&
- (pgethostbyname = (Pgethostbyname)GetProcAddress(hDll, "gethostbyname")) &&
- (pgetservbyport = (Pgetservbyport)GetProcAddress(hDll, "getservbyport")) &&
- (pgetservbyname = (Pgetservbyname)GetProcAddress(hDll, "getservbyname")) &&
- (pgetprotobynumber = (Pgetprotobynumber)GetProcAddress(hDll, "getprotobynumber")) &&
- (pgetprotobyname = (Pgetprotobyname)GetProcAddress(hDll, "getprotobyname")) &&
- (pWSAStartup = (PWSAStartup)GetProcAddress(hDll, "WSAStartup")) &&
- (pWSACleanup = (PWSACleanup)GetProcAddress(hDll, "WSACleanup")) &&
- (pWSASetLastError = (PWSASetLastError)GetProcAddress(hDll, "WSASetLastError")) &&
- (pWSAGetLastError = (PWSAGetLastError)GetProcAddress(hDll, "WSAGetLastError")) &&
- (p__WSAFDIsSet = (P__WSAFDIsSet)GetProcAddress(hDll, "__WSAFDIsSet")) &&
- (pselect = (Pselect)GetProcAddress(hDll, "select")) &&
- (pgethostname = (Pgethostname)GetProcAddress(hDll, "gethostname")) &&
-#if BYTEORDER != 0x1234
- (phtonl = (Phtonl)GetProcAddress(hDll, "htonl")) &&
- (pntohl = (Pntohl)GetProcAddress(hDll, "ntohl")) &&
- (phtons = (Pntohs)GetProcAddress(hDll, "htons")) &&
- (pntohs = (Pntohs)GetProcAddress(hDll, "ntohs")
-#else
- 1
-#endif
- )) {
- Perl_croak(aTHX_ "Unable to load winsock library!\n");
- }
-#endif /* PERL_WIN32_SOCK_DLOAD */
version = 0x101;
- if(ret = CALL(WSAStartup)(version, &retdata))
- Perl_croak(aTHX_ "Unable to initialize winsock library!\n");
+ if(ret = WSAStartup(version, &retdata))
+ Perl_croak_nocontext("Unable to locate winsock library!\n");
if(retdata.wVersion != version)
- Perl_croak(aTHX_ "Could not find version 1.1 of winsock dll\n");
+ Perl_croak_nocontext("Could not find version 1.1 of winsock dll\n");
-#ifdef PERL_WIN32_SOCK_DLOAD
- call_atexit(end_sockets, hDll);
-#endif
+ /* atexit((void (*)(void)) EndSockets); */
wsock_started = 1;
}
set_socktype(void)
{
#ifdef USE_SOCKETS_AS_HANDLES
-#ifdef USE_THREADS
- dTHX;
+#if defined(USE_THREADS) || defined(USE_ITHREADS)
+ dTHXo;
if (!w32_init_socktype) {
#endif
int iSockOpt = SO_SYNCHRONOUS_NONALERT;
/*
* Enable the use of sockets as filehandles
*/
- CALL(setsockopt)(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE,
+ setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE,
(char *)&iSockOpt, sizeof(iSockOpt));
-#ifdef USE_THREADS
+#if defined(USE_THREADS) || defined(USE_ITHREADS)
w32_init_socktype = 1;
}
#endif
if (!wsock_started)
return(fdopen(fd, mode));
- retval = CALL(getsockopt)((SOCKET)fd, SOL_SOCKET, SO_TYPE, sockbuf, &optlen);
- if(retval == SOCKET_ERROR && CALL(WSAGetLastError)() == WSAENOTSOCK) {
+ 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(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;
}
#endif /* USE_SOCKETS_AS_HANDLES */
-/* ntoh* and hton* are implemented here so that ByteLoader doesn't need to load WinSock;
- these functions are simply copied from util.c */
u_long
-win32_htonl(u_long l)
-{
-#if BYTEORDER == 0x1234
- union { u_long r; char c[4]; } u;
- u.c[0] = (l >> 24) & 255;
- u.c[1] = (l >> 16) & 255;
- u.c[2] = (l >> 8) & 255;
- u.c[3] = l & 255;
- return u.r;
-#else
+win32_htonl(u_long hostlong)
+{
StartSockets();
- return CALL(htonl)(l);
-#endif
+ return htonl(hostlong);
}
u_short
-win32_htons(u_short s)
+win32_htons(u_short hostshort)
{
-#if BYTEORDER == 0x1234
- return (((s >> 8) & 255) | ((s & 255) << 8));
-#else
StartSockets();
- return CALL(htons)(s);
-#endif
+ return htons(hostshort);
}
u_long
-win32_ntohl(u_long l)
-{
-#if BYTEORDER == 0x1234
- union { u_long r; char c[4]; } u;
- u.c[0] = (l >> 24) & 255;
- u.c[1] = (l >> 16) & 255;
- u.c[2] = (l >> 8) & 255;
- u.c[3] = l & 255;
- return u.r;
-#else
+win32_ntohl(u_long netlong)
+{
StartSockets();
- return CALL(ntohl)(l);
-#endif
+ return ntohl(netlong);
}
u_short
-win32_ntohs(u_short s)
+win32_ntohs(u_short netshort)
{
-#if BYTEORDER == 0x1234
- return (((s >> 8) & 255) | ((s & 255) << 8));
-#else
StartSockets();
- return CALL(ntohs)(s);
-#endif
+ return ntohs(netshort);
}
{
SOCKET r;
- SOCKET_TEST((r = CALL(accept)(TO_SOCKET(s), addr, addrlen)), INVALID_SOCKET);
+ SOCKET_TEST((r = accept(TO_SOCKET(s), addr, addrlen)), INVALID_SOCKET);
return OPEN_SOCKET(r);
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(bind)(TO_SOCKET(s), addr, addrlen));
+ SOCKET_TEST_ERROR(r = bind(TO_SOCKET(s), addr, addrlen));
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(connect)(TO_SOCKET(s), addr, addrlen));
+ SOCKET_TEST_ERROR(r = connect(TO_SOCKET(s), addr, addrlen));
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(getpeername)(TO_SOCKET(s), addr, addrlen));
+ SOCKET_TEST_ERROR(r = getpeername(TO_SOCKET(s), addr, addrlen));
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(getsockname)(TO_SOCKET(s), addr, addrlen));
+ SOCKET_TEST_ERROR(r = getsockname(TO_SOCKET(s), addr, addrlen));
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(getsockopt)(TO_SOCKET(s), level, optname, optval, optlen));
+ SOCKET_TEST_ERROR(r = getsockopt(TO_SOCKET(s), level, optname, optval, optlen));
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(ioctlsocket)(TO_SOCKET(s), cmd, argp));
+ SOCKET_TEST_ERROR(r = ioctlsocket(TO_SOCKET(s), cmd, argp));
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(listen)(TO_SOCKET(s), backlog));
+ SOCKET_TEST_ERROR(r = listen(TO_SOCKET(s), backlog));
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(recv)(TO_SOCKET(s), buf, len, flags));
+ SOCKET_TEST_ERROR(r = recv(TO_SOCKET(s), buf, len, flags));
return r;
}
int r;
int frombufsize = *fromlen;
- SOCKET_TEST_ERROR(r = CALL(recvfrom)(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.
FD_SET(fd, &nex);
}
- SOCKET_TEST_ERROR(r = CALL(select)(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);
- if (PERL_FD_ISSET(i,rd) && !CALL(__WSAFDIsSet)(fd, &nrd))
+ if (PERL_FD_ISSET(i,rd) && !FD_ISSET(fd, &nrd))
PERL_FD_CLR(i,rd);
- if (PERL_FD_ISSET(i,wr) && !CALL(__WSAFDIsSet)(fd, &nwr))
+ if (PERL_FD_ISSET(i,wr) && !FD_ISSET(fd, &nwr))
PERL_FD_CLR(i,wr);
- if (PERL_FD_ISSET(i,ex) && !CALL(__WSAFDIsSet)(fd, &nex))
+ if (PERL_FD_ISSET(i,ex) && !FD_ISSET(fd, &nex))
PERL_FD_CLR(i,ex);
}
#else
- SOCKET_TEST_ERROR(r = CALL(select)(nfds, rd, wr, ex, timeout));
+ SOCKET_TEST_ERROR(r = select(nfds, rd, wr, ex, timeout));
#endif
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(send)(TO_SOCKET(s), buf, len, flags));
+ SOCKET_TEST_ERROR(r = send(TO_SOCKET(s), buf, len, flags));
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(sendto)(TO_SOCKET(s), buf, len, flags, to, tolen));
+ SOCKET_TEST_ERROR(r = sendto(TO_SOCKET(s), buf, len, flags, to, tolen));
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(setsockopt)(TO_SOCKET(s), level, optname, optval, optlen));
+ SOCKET_TEST_ERROR(r = setsockopt(TO_SOCKET(s), level, optname, optval, optlen));
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(shutdown)(TO_SOCKET(s), how));
+ SOCKET_TEST_ERROR(r = shutdown(TO_SOCKET(s), how));
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(closesocket)(TO_SOCKET(s)));
+ SOCKET_TEST_ERROR(r = closesocket(TO_SOCKET(s)));
return r;
}
SOCKET s;
#ifndef USE_SOCKETS_AS_HANDLES
- SOCKET_TEST(s = CALL(socket)(af, type, protocol), INVALID_SOCKET);
+ SOCKET_TEST(s = socket(af, type, protocol), INVALID_SOCKET);
#else
StartSockets();
- if((s = CALL(socket)(af, type, protocol)) == INVALID_SOCKET)
- errno = CALL(WSAGetLastError)();
+ if((s = socket(af, type, protocol)) == INVALID_SOCKET)
+ errno = WSAGetLastError();
else
s = OPEN_SOCKET(s);
#endif /* USE_SOCKETS_AS_HANDLES */
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
- && CALL(closesocket)(osf) == SOCKET_ERROR
- && CALL(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);
}
struct hostent *
{
struct hostent *r;
- SOCKET_TEST(r = CALL(gethostbyaddr)(addr, len, type), NULL);
+ SOCKET_TEST(r = gethostbyaddr(addr, len, type), NULL);
return r;
}
{
struct hostent *r;
- SOCKET_TEST(r = CALL(gethostbyname)(name), NULL);
+ SOCKET_TEST(r = gethostbyname(name), NULL);
return r;
}
{
int r;
- SOCKET_TEST_ERROR(r = CALL(gethostname)(name, len));
+ SOCKET_TEST_ERROR(r = gethostname(name, len));
return r;
}
{
struct protoent *r;
- SOCKET_TEST(r = CALL(getprotobyname)(name), NULL);
+ SOCKET_TEST(r = getprotobyname(name), NULL);
return r;
}
{
struct protoent *r;
- SOCKET_TEST(r = CALL(getprotobynumber)(num), NULL);
+ SOCKET_TEST(r = getprotobynumber(num), NULL);
return r;
}
dTHXo;
struct servent *r;
- SOCKET_TEST(r = CALL(getservbyname)(name, proto), NULL);
+ SOCKET_TEST(r = getservbyname(name, proto), NULL);
if (r) {
r = win32_savecopyservent(&w32_servent, r, proto);
}
dTHXo;
struct servent *r;
- SOCKET_TEST(r = CALL(getservbyport)(port, proto), NULL);
+ SOCKET_TEST(r = getservbyport(port, proto), NULL);
if (r) {
r = win32_savecopyservent(&w32_servent, r, proto);
}
/* NOTREACHED */
}
- retval = CALL(ioctlsocket)(TO_SOCKET(i), (long)u, &argp);
+ retval = ioctlsocket(TO_SOCKET(i), (long)u, &argp);
if (retval == SOCKET_ERROR) {
- if (CALL(WSAGetLastError)() == WSAENOTSOCK) {
+ if (WSAGetLastError() == WSAENOTSOCK) {
Perl_croak_nocontext("ioctl implemented only on sockets");
/* NOTREACHED */
}
- errno = CALL(WSAGetLastError)();
+ errno = WSAGetLastError();
}
return retval;
}
win32_inet_ntoa(struct in_addr in)
{
StartSockets();
- return CALL(inet_ntoa)(in);
+ return inet_ntoa(in);
}
unsigned long
win32_inet_addr(const char FAR *cp)
{
StartSockets();
- return CALL(inet_addr)(cp);
+ return inet_addr(cp);
}
/*