-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.12 2001/07/01 17:04:11 oes Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.19 2001/10/25 03:40:47 david__schmidt Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
*
* Revisions :
* $Log: jbsockets.c,v $
+ * 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
+ * - Permanently turned off WIN_GUI_EDIT
+ * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ * Revision 1.15 2001/07/29 17:40:43 jongfoster
+ * Fixed compiler warning by adding a cast
+ *
+ * Revision 1.14 2001/07/18 13:47:59 oes
+ * Eliminated dirty hack for getsockbyname()
+ *
+ * Revision 1.13 2001/07/15 13:56:57 jongfoster
+ * Removing unused local variable.
+ *
* Revision 1.12 2001/07/01 17:04:11 oes
* Bugfix: accept_connection no longer uses the obsolete hstrerror() function
*
#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"
int flags;
#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
struct access_control_addr dst[1];
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
memset((char *)&inaddr, 0, sizeof inaddr);
return(-1);
}
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
dst->addr = ntohl(addr);
dst->port = portnum;
if (block_acl(dst, csp))
{
+#ifdef __OS2__
+ errno = SOCEPERM;
+#else
errno = EPERM;
+#endif
return(-1);
}
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
inaddr.sin_addr.s_addr = addr;
inaddr.sin_family = AF_INET;
csp->http->host_ip_addr_str = strdup(inet_ntoa(inaddr.sin_addr));
+#ifndef _WIN32
if (sizeof(inaddr.sin_port) == sizeof(short))
+#endif /* ndef _WIN32 */
{
inaddr.sin_port = htons((short)portnum);
}
+#ifndef _WIN32
else
{
inaddr.sin_port = htonl(portnum);
}
+#endif /* ndef _WIN32 */
if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) < 0)
{
}
#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);
inaddr.sin_family = AF_INET;
inaddr.sin_addr.s_addr = resolve_hostname_to_ip(hostnam);
+#ifndef _WIN32
if (sizeof(inaddr.sin_port) == sizeof(short))
+#endif /* ndef _WIN32 */
{
inaddr.sin_port = htons((short)portnum);
}
+#ifndef _WIN32
else
{
inaddr.sin_port = htonl(portnum);
}
+#endif /* ndef _WIN32 */
fd = socket(AF_INET, SOCK_STREAM, 0);
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)
{
*********************************************************************/
int accept_connection(struct client_state * csp, int fd)
{
- struct sockaddr raddr, laddr;
- struct sockaddr_in *rap = (struct sockaddr_in *) &raddr;
- struct sockaddr_in *lap = (struct sockaddr_in *) &laddr;
+ struct sockaddr_in client, server;
struct hostent *host = NULL;
- int afd, raddrlen, laddrlen;
+ int afd, c_length, s_length;
+
+ c_length = s_length = sizeof(client);
- raddrlen = sizeof raddr;
do
{
- afd = accept (fd, &raddr, &raddrlen);
+ afd = accept (fd, (struct sockaddr *) &client, &c_length);
} while (afd < 1 && errno == EINTR);
if (afd < 0)
* Determine the IP-Adress that the client used to reach us
* and the hostname associated with that address
*/
- if (!getsockname(afd, &laddr, &laddrlen))
+ if (!getsockname(afd, (struct sockaddr *) &server, &s_length))
{
- csp->my_ip_addr_str = strdup(inet_ntoa(lap->sin_addr));
+ csp->my_ip_addr_str = strdup(inet_ntoa(server.sin_addr));
- host = gethostbyaddr(laddr.sa_data + 2, 4, AF_INET);
+ host = gethostbyaddr((const char *)&server.sin_addr,
+ sizeof(server.sin_addr), AF_INET);
if (host == NULL)
{
log_error(LOG_LEVEL_ERROR, "Unable to get my own hostname: %E\n");
}
csp->cfd = afd;
- csp->ip_addr_str = strdup(inet_ntoa(rap->sin_addr));
- csp->ip_addr_long = ntohl(rap->sin_addr.s_addr);
+ csp->ip_addr_str = strdup(inet_ntoa(client.sin_addr));
+ csp->ip_addr_long = ntohl(client.sin_addr.s_addr);
return 1;