diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/perllib.c | 6 | ||||
| -rw-r--r-- | win32/win32io.c | 9 | ||||
| -rw-r--r-- | win32/win32iop.h | 12 | ||||
| -rw-r--r-- | win32/win32sck.c | 394 |
4 files changed, 155 insertions, 266 deletions
diff --git a/win32/perllib.c b/win32/perllib.c index 317c88ac05..56cba541b9 100644 --- a/win32/perllib.c +++ b/win32/perllib.c @@ -7,12 +7,6 @@ #include "perl.h" #include "XSUB.h" -#ifdef __cplusplus -# define EXTERN_C extern "C" -#else -# define EXTERN_C extern -#endif - static void xs_init _((void)); __declspec(dllexport) int diff --git a/win32/win32io.c b/win32/win32io.c index 0e2e649059..e4d0bd86c8 100644 --- a/win32/win32io.c +++ b/win32/win32io.c @@ -16,15 +16,6 @@ extern int my_fclose(FILE *pf); #include <process.h> #include <direct.h> - -#ifdef __cplusplus -#define START_EXTERN_C extern "C" { -#define END_EXTERN_C } -#else -#define START_EXTERN_C -#define END_EXTERN_C -#endif - #include "win32iop.h" /* diff --git a/win32/win32iop.h b/win32/win32iop.h index 52acce1a9b..c5f718ac36 100644 --- a/win32/win32iop.h +++ b/win32/win32iop.h @@ -1,6 +1,18 @@ #ifndef WIN32IOP_H #define WIN32IOP_H +#ifndef START_EXTERN_C +#ifdef __cplusplus +# define START_EXTERN_C extern "C" { +# define END_EXTERN_C } +# define EXTERN_C extern "C" +#else +# define START_EXTERN_C +# define END_EXTERN_C +# define EXTERN_C +#endif +#endif + /* * defines for flock emulation */ diff --git a/win32/win32sck.c b/win32/win32sck.c index b4ad4f4cfb..27ae06063e 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/ @@ -17,193 +17,103 @@ #include <sys/stat.h> #include <assert.h> -#define CROAK croak +#undef htonl +#undef htons +#undef ntohl +#undef ntohs +#undef inet_addr +#undef inet_ntoa +#undef socket +#undef bind +#undef listen +#undef accept +#undef connect +#undef send +#undef sendto +#undef recv +#undef recvfrom +#undef shutdown +#undef ioctlsocket +#undef setsockopt +#undef getsockopt +#undef getpeername +#undef getsockname +#undef gethostname +#undef gethostbyname +#undef gethostbyaddr +#undef getprotobyname +#undef getprotobynumber +#undef getservbyname +#undef getservbyport +#undef select +#undef endhostent +#undef endnetent +#undef endprotoent +#undef endservent +#undef getnetent +#undef getnetbyname +#undef getnetbyaddr +#undef getprotoent +#undef getservent +#undef sethostent +#undef setnetent +#undef setprotoent +#undef setservent -#ifdef USE_SOCKETS_AS_HANDLES /* thanks to Beverly Brown (beverly@datacube.com) */ - -#define OPEN_SOCKET(x) _open_osfhandle(x,O_RDWR|O_BINARY) -#define TO_SOCKET(x) _get_osfhandle(x) - +#ifdef USE_SOCKETS_AS_HANDLES +# define OPEN_SOCKET(x) _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 */ +#define StartSockets() \ + STMT_START { \ + if (!wsock_started) \ + start_sockets(); \ + } STMT_END + +#define EndSockets() \ + STMT_START { \ + if (wsock_started) \ + WSACleanup(); \ + } STMT_END + +#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) + static struct servent* win32_savecopyservent(struct servent*d, struct servent*s, const char *proto); -#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; __declspec(thread) struct servent myservent; - - -void * -GetAddress(HINSTANCE hInstance, char *lpFunctionName) -{ - FARPROC proc = GetProcAddress(hInstance, lpFunctionName); - if(proc == 0) - CROAK("Unable to get address of %s in WSock32.dll", lpFunctionName); - return proc; -} - -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); */ -} +static int wsock_started = 0; void -EndSockets(void) -{ - if(hWinSockDll != NULL) { - pWSACleanup(); - FreeLibrary(hWinSockDll); - } - hWinSockDll = NULL; -} - -void -StartSockets(void) +start_sockets(void) { 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)) + croak("Unable to locate winsock library!\n"); if(retdata.wVersion != version) - CROAK("Could not find version 1.1 of winsock dll\n"); + croak("Could not find version 1.1 of winsock dll\n"); /* atexit((void (*)(void)) EndSockets); */ @@ -211,9 +121,10 @@ StartSockets(void) /* * 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)); #endif /* USE_SOCKETS_AS_HANDLES */ + wsock_started = 1; } @@ -226,11 +137,11 @@ myfdopen(int fd, char *mode) int optlen = sizeof(sockbuf); int retval; - if (hWinSockDll == 0) + if (!wsock_started) return(fdopen(fd, mode)); - retval = pgetsockopt((SOCKET)fd, SOL_SOCKET, SO_TYPE, sockbuf, &optlen); - if(retval == SOCKET_ERROR && pWSAGetLastError() == WSAENOTSOCK) { + retval = getsockopt((SOCKET)fd, SOL_SOCKET, SO_TYPE, sockbuf, &optlen); + if(retval == SOCKET_ERROR && WSAGetLastError() == WSAENOTSOCK) { return(fdopen(fd, mode)); } @@ -257,51 +168,39 @@ myfdopen(int fd, char *mode) u_long win32_htonl(u_long hostlong) { - if(hWinSockDll == 0) - StartSockets(); - - return phtonl(hostlong); + StartSockets(); + return htonl(hostlong); } u_short win32_htons(u_short hostshort) { - if(hWinSockDll == 0) - StartSockets(); - - return phtons(hostshort); + StartSockets(); + return htons(hostshort); } u_long win32_ntohl(u_long netlong) { - if(hWinSockDll == 0) - StartSockets(); - - return pntohl(netlong); + StartSockets(); + return ntohl(netlong); } u_short win32_ntohs(u_short netshort) { - if(hWinSockDll == 0) - StartSockets(); - - 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); } @@ -310,7 +209,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; } @@ -319,7 +218,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; } @@ -329,7 +228,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; } @@ -338,7 +237,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; } @@ -347,7 +246,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; } @@ -356,7 +255,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; } @@ -365,7 +264,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; } @@ -374,7 +273,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; } @@ -383,7 +282,7 @@ win32_recvfrom(SOCKET s, char *buf, int len, int flags, struct sockaddr *from, i { int r; - 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)); return r; } @@ -424,22 +323,22 @@ win32_select(int nfds, int* rd, int* wr, int* ex, const struct timeval* timeout) 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)) + if (!__WSAFDIsSet(fd, &nrd)) rd[offset] &= ~bit; } if (wr[offset] & bit) { - if (!pWSAFDIsSet(fd, &nwr)) + if (!__WSAFDIsSet(fd, &nwr)) wr[offset] &= ~bit; } if (ex[offset] & bit) { - if (!pWSAFDIsSet(fd, &nex)) + if (!__WSAFDIsSet(fd, &nex)) ex[offset] &= ~bit; } } @@ -451,7 +350,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; } @@ -461,7 +360,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; } @@ -470,7 +369,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; } @@ -479,7 +378,7 @@ 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; } @@ -488,14 +387,12 @@ win32_socket(int af, int type, int protocol) { SOCKET s; + StartSockets(); #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(); + if((s = socket(af, type, protocol)) == INVALID_SOCKET) + errno = WSAGetLastError(); else s = OPEN_SOCKET(s); #endif /* USE_SOCKETS_AS_HANDLES */ @@ -507,16 +404,18 @@ win32_socket(int af, int type, int protocol) int my_fclose (FILE *pf) { - int osf, retval; - if (hWinSockDll == 0) /* No WinSockDLL? */ - 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 - && pclosesocket(osf) == SOCKET_ERROR - && WSAGetLastError() != WSAENOTSOCK) - retval = EOF; - return retval; + 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 * @@ -524,7 +423,7 @@ 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; } @@ -533,7 +432,7 @@ win32_gethostbyname(const char *name) { struct hostent *r; - SOCKET_TEST(r = pgethostbyname(name), NULL); + SOCKET_TEST(r = gethostbyname(name), NULL); return r; } @@ -542,7 +441,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; } @@ -551,7 +450,7 @@ win32_getprotobyname(const char *name) { struct protoent *r; - SOCKET_TEST(r = pgetprotobyname(name), NULL); + SOCKET_TEST(r = getprotobyname(name), NULL); return r; } @@ -560,7 +459,7 @@ win32_getprotobynumber(int num) { struct protoent *r; - SOCKET_TEST(r = pgetprotobynumber(num), NULL); + SOCKET_TEST(r = getprotobynumber(num), NULL); return r; } @@ -569,7 +468,7 @@ win32_getservbyname(const char *name, const char *proto) { 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); } @@ -581,7 +480,7 @@ win32_getservbyport(int port, const char *proto) { 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); } @@ -591,113 +490,106 @@ win32_getservbyport(int port, const char *proto) char FAR * win32_inet_ntoa(struct in_addr in) { - if(hWinSockDll == 0) - StartSockets(); - - return pinet_ntoa(in); + StartSockets(); + return inet_ntoa(in); } unsigned long win32_inet_addr(const char FAR *cp) { - if(hWinSockDll == 0) - StartSockets(); - - return pinet_addr(cp); - + StartSockets(); + return inet_addr(cp); } /* * Networking stubs */ -#undef CROAK -#define CROAK croak void win32_endhostent() { - CROAK("endhostent not implemented!\n"); + croak("endhostent not implemented!\n"); } void win32_endnetent() { - CROAK("endnetent not implemented!\n"); + croak("endnetent not implemented!\n"); } void win32_endprotoent() { - CROAK("endprotoent not implemented!\n"); + croak("endprotoent not implemented!\n"); } void win32_endservent() { - CROAK("endservent not implemented!\n"); + croak("endservent not implemented!\n"); } struct netent * win32_getnetent(void) { - CROAK("getnetent not implemented!\n"); + croak("getnetent not implemented!\n"); return (struct netent *) NULL; } struct netent * win32_getnetbyname(char *name) { - CROAK("getnetbyname not implemented!\n"); + croak("getnetbyname not implemented!\n"); return (struct netent *)NULL; } struct netent * win32_getnetbyaddr(long net, int type) { - CROAK("getnetbyaddr not implemented!\n"); + croak("getnetbyaddr not implemented!\n"); return (struct netent *)NULL; } struct protoent * win32_getprotoent(void) { - CROAK("getprotoent not implemented!\n"); + croak("getprotoent not implemented!\n"); return (struct protoent *) NULL; } struct servent * win32_getservent(void) { - CROAK("getservent not implemented!\n"); + croak("getservent not implemented!\n"); return (struct servent *) NULL; } void win32_sethostent(int stayopen) { - CROAK("sethostent not implemented!\n"); + croak("sethostent not implemented!\n"); } void win32_setnetent(int stayopen) { - CROAK("setnetent not implemented!\n"); + croak("setnetent not implemented!\n"); } void win32_setprotoent(int stayopen) { - CROAK("setprotoent not implemented!\n"); + croak("setprotoent not implemented!\n"); } void win32_setservent(int stayopen) { - CROAK("setservent not implemented!\n"); + croak("setservent not implemented!\n"); } #define WIN32IO_IS_STDIO |