-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.16 2001/07/30 22:08:36 jongfoster Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.20 2001/11/16 00:48:48 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
*
* Revisions :
* $Log: jbsockets.c,v $
+ * Revision 1.20 2001/11/16 00:48:48 jongfoster
+ * Enabling duplicate-socket detection for all platforms, not
+ * just Win32.
+ *
+ * Revision 1.19 2001/10/25 03:40:47 david__schmidt
+ * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
+ * threads to call select() simultaneously. So, it's time to do a real, live,
+ * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__
+ * (native). Both versions will work, but using __OS2__ offers multi-threading.
+ *
+ * Revision 1.18 2001/09/21 23:02:02 david__schmidt
+ * Cleaning up 2 compiler warnings on OS/2.
+ *
+ * Revision 1.17 2001/09/13 20:11:46 jongfoster
+ * Fixing 2 compiler warnings under Win32
+ *
* Revision 1.16 2001/07/30 22:08:36 jongfoster
* Tidying up #defines:
* - All feature #defines are now of the form FEATURE_xxx
#else
+#ifndef __OS2__
#include <unistd.h>
+#endif
#include <sys/time.h>
#include <netinet/in.h>
#include <sys/ioctl.h>
#ifndef __BEOS__
#include <netinet/tcp.h>
+#ifndef __OS2__
#include <arpa/inet.h>
+#endif
#else
#include <socket.h>
#endif
+#if defined(__EMX__) || defined (__OS2__)
+#include <sys/select.h> /* OS/2/EMX needs a little help with select */
+#include <nerrno.h>
+#endif
+
#endif
#include "project.h"
if (block_acl(dst, csp))
{
+#ifdef __OS2__
+ errno = SOCEPERM;
+#else
errno = EPERM;
+#endif
return(-1);
}
#endif /* def FEATURE_ACL */
}
#endif /* def TCP_NODELAY */
-#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__)
if ((flags = fcntl(fd, F_GETFL, 0)) != -1)
{
flags |= O_NDELAY;
fcntl(fd, F_SETFL, flags);
}
-#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
+#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) */
while (connect(fd, (struct sockaddr *) & inaddr, sizeof inaddr) == -1)
{
#ifdef _WIN32
if (errno == WSAEINPROGRESS)
+#elif __OS2__
+ if (sock_errno() == EINPROGRESS)
#else /* ifndef _WIN32 */
if (errno == EINPROGRESS)
-#endif /* ndef _WIN32 */
+#endif /* ndef _WIN32 || __OS2__ */
{
break;
}
+#ifdef __OS2__
+ if (sock_errno() != EINTR)
+#else
if (errno != EINTR)
+#endif /* __OS2__ */
{
close_socket(fd);
return(-1);
}
}
-#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)
+#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__)
if (flags != -1)
{
flags &= ~O_NDELAY;
fcntl(fd, F_SETFL, flags);
}
-#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
+#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) && !defined(__OS2__) */
/* wait for connection to complete */
FD_ZERO(&wfds);
log_error(LOG_LEVEL_LOG, "%N", len, buf);
-#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA)
+#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) || defined(__OS2__)
return( send(fd, buf, len, 0));
#else
return( write(fd, buf, len));
return(0);
}
-#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA)
+#if defined(_WIN32) || defined(__BEOS__) || defined(AMIGA) || defined(__OS2__)
return( recv(fd, buf, len, 0));
#else
return( read(fd, buf, len));
closesocket(fd);
#elif defined(AMIGA)
CloseSocket(fd);
+#elif defined(__OS2__)
+ soclose(fd);
#else
close(fd);
#endif
{
struct sockaddr_in inaddr;
int fd;
+#if 0
+#ifndef _WIN32
int one = 1;
+#endif /* ndef _WIN32 */
+#endif
memset((char *)&inaddr, '\0', sizeof inaddr);
return(-1);
}
+#if 0
#ifndef _WIN32
/*
* FIXME: This is not needed for Win32 - in fact, it stops
*/
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one));
#endif /* ndef _WIN32 */
+#endif
if (bind (fd, (struct sockaddr *)&inaddr, sizeof(inaddr)) < 0)
{
struct sockaddr_in client, server;
struct hostent *host = NULL;
int afd, c_length, s_length;
+#if defined(HAVE_GETHOSTBYADDR_R_8_ARGS) || defined(HAVE_GETHOSTBYADDR_R_7_ARGS) || defined(HAVE_GETHOSTBYADDR_R_5_ARGS)
+ struct hostent result;
+#if defined(HAVE_GETHOSTBYADDR_R_5_ARGS)
+ struct hostent_data hdata;
+#else
+ char hbuf[HOSTENT_BUFFER_SIZE];
+ int thd_err;
+#endif /* def HAVE_GETHOSTBYADDR_R_5_ARGS */
+#endif /* def HAVE_GETHOSTBYADDR_R_(8|7|5)_ARGS */
c_length = s_length = sizeof(client);
if (!getsockname(afd, (struct sockaddr *) &server, &s_length))
{
csp->my_ip_addr_str = strdup(inet_ntoa(server.sin_addr));
-
+#if defined(HAVE_GETHOSTBYADDR_R_8_ARGS)
+ gethostbyaddr_r((const char *)&server.sin_addr,
+ sizeof(server.sin_addr), AF_INET,
+ &result, hbuf, HOSTENT_BUFFER_SIZE,
+ &host, &thd_err);
+#elif defined(HAVE_GETHOSTBYADDR_R_7_ARGS)
+ host = gethostbyaddr_r((const char *)&server.sin_addr,
+ sizeof(server.sin_addr), AF_INET,
+ &result, hbuf, HOSTENT_BUFFER_SIZE, &thd_err);
+#elif defined(HAVE_GETHOSTBYADDR_R_5_ARGS)
+ if (0 == gethostbyaddr_r((const char *)&server.sin_addr,
+ sizeof(server.sin_addr), AF_INET,
+ &result, &hdata))
+ {
+ host = &result;
+ }
+ else
+ {
+ host = NULL;
+ }
+#else
host = gethostbyaddr((const char *)&server.sin_addr,
sizeof(server.sin_addr), AF_INET);
+#endif
if (host == NULL)
{
log_error(LOG_LEVEL_ERROR, "Unable to get my own hostname: %E\n");
{
struct sockaddr_in inaddr;
struct hostent *hostp;
+#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS) || defined(HAVE_GETHOSTBYNAME_R_5_ARGS) || defined(HAVE_GETHOSTBYNAME_R_3_ARGS)
+ struct hostent result;
+#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS) || defined(HAVE_GETHOSTBYNAME_R_5_ARGS)
+ char hbuf[HOSTENT_BUFFER_SIZE];
+ int thd_err;
+#else /* defined(HAVE_GETHOSTBYNAME_R_3_ARGS) */
+ struct hostent_data hdata;
+#endif /* def HAVE_GETHOSTBYNAME_R_(6|5)_ARGS */
+#endif /* def HAVE_GETHOSTBYNAME_R_(6|5|3)_ARGS */
if ((host == NULL) || (*host == '\0'))
{
if ((inaddr.sin_addr.s_addr = inet_addr(host)) == -1)
{
- if ((hostp = gethostbyname(host)) == NULL)
+#if defined(HAVE_GETHOSTBYNAME_R_6_ARGS)
+ gethostbyname_r(host, &result, hbuf,
+ HOSTENT_BUFFER_SIZE, &hostp, &thd_err);
+#elif defined(HAVE_GETHOSTBYNAME_R_5_ARGS)
+ hostp = gethostbyname_r(host, &result, hbuf,
+ HOSTENT_BUFFER_SIZE, &thd_err);
+#elif defined(HAVE_GETHOSTBYNAME_R_3_ARGS)
+ if (0 == gethostbyname_r(host, &result, &hdata))
+ {
+ hostp = &result;
+ }
+ else
+ {
+ hostp = NULL;
+ }
+#else
+ hostp = gethostbyname(host);
+#endif /* def HAVE_GETHOSTBYNAME_R_(6|5|3)_ARGS */
+ if (hostp == NULL)
{
errno = EINVAL;
return(-1);
errno = WSAEPROTOTYPE;
#else
errno = EPROTOTYPE;
-#endif
+#endif
return(-1);
}
memcpy(