dreid 99/10/24 05:27:35
Modified: src/lib/apr/network_io/beos networkio.h sockets.c sockopt.c
Added: src/lib/apr/network_io/beos sockaddr.c
Log:
Bring BeOS back into line with Ben's changes to the network API.
Revision Changes Path
1.7 +3 -1 apache-2.0/src/lib/apr/network_io/beos/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/networkio.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- networkio.h 1999/10/23 14:43:43 1.6
+++ networkio.h 1999/10/24 12:27:33 1.7
@@ -79,9 +79,11 @@
struct socket_t {
ap_context_t *cntxt;
int socketdes;
- struct sockaddr_in * addr;
+ struct sockaddr_in *local_addr;
+ struct sockaddr_in *remote_addr;
int addr_len;
int timeout;
+ int connected;
};
struct pollfd_t {
1.9 +27 -49 apache-2.0/src/lib/apr/network_io/beos/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sockets.c 1999/10/15 14:20:09 1.8
+++ sockets.c 1999/10/24 12:27:33 1.9
@@ -83,16 +83,19 @@
}
(*new)->cntxt = cont;
- (*new)->addr = (struct sockaddr_in *) ap_palloc((*new)->cntxt,
+ (*new)->local_addr = (struct sockaddr_in *) ap_palloc((*new)->cntxt,
sizeof (struct sockaddr_in));
- if ((*new)->addr == NULL){
+ (*new)->remote_addr = (struct sockaddr_in *) ap_palloc((*new)->cntxt,
+ sizeof (struct sockaddr_in));
+ if ((*new)->local_addr == NULL || (*new)->remote_addr==NULL){
return APR_ENOMEM;
}
(*new)->socketdes = socket(AF_INET ,SOCK_STREAM, 0);
- (*new)->addr->sin_family = AF_INET;
- (*new)->addr_len = sizeof(*(*new)->addr);
- memset(&(*new)->addr->sin_zero, 0, sizeof((*new)->addr->sin_zero));
+ (*new)->local_addr->sin_family = AF_INET;
+ (*new)->remote_addr->sin_family = AF_INET;
+ (*new)->addr_len = sizeof(*(*new)->local_addr);
+ memset(&(*new)->local_addr->sin_zero, 0,
sizeof((*new)->local_addr->sin_zero));
if ((*new)->socketdes < 0) {
return errno;
@@ -120,42 +123,10 @@
return socket_cleanup(thesocket);
}
-ap_status_t ap_setport(struct socket_t *sock, ap_uint32_t port)
-{
- sock->addr->sin_port = htons((short)port);
- return APR_SUCCESS;
-}
-
-ap_status_t ap_getport(ap_uint32_t *port, struct socket_t *sock)
-{
- *port = ntohs(sock->addr->sin_port);
- return APR_SUCCESS;
-}
-
-ap_status_t ap_setipaddr(struct socket_t *sock, const char *addr)
-{
- if (!strcmp(addr, APR_ANYADDR)) {
- sock->addr->sin_addr.s_addr = htonl(INADDR_ANY);
- return APR_SUCCESS;
- }
- if (inet_aton(addr, &sock->addr->sin_addr) == 0) {
- return errno;
- }
- return APR_SUCCESS;
-}
-
-ap_status_t ap_getipaddr(char *addr, ap_ssize_t len,
- const struct socket_t *sock)
-{
- char *temp = inet_ntoa(sock->addr->sin_addr);
- ap_cpystrn(addr,temp,len-1);
- return APR_SUCCESS;
-}
-
ap_status_t ap_bind(struct socket_t *sock)
{
- sock->addr->sin_addr.s_addr = INADDR_ANY;
- if (bind(sock->socketdes, (struct sockaddr *)sock->addr, sock->addr_len)
== -1)
+ sock->local_addr->sin_addr.s_addr = INADDR_ANY;
+ if (bind(sock->socketdes, (struct sockaddr *)sock->local_addr,
sock->addr_len) == -1)
return errno;
else
return APR_SUCCESS;
@@ -175,11 +146,14 @@
sizeof(ap_socket_t));
(*new)->cntxt = sock->cntxt;
- (*new)->addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt,
+ (*new)->local_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt,
+ sizeof(struct sockaddr_in));
+ (*new)->remote_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt,
sizeof(struct sockaddr_in));
(*new)->addr_len = sizeof(struct sockaddr_in);
-
- (*new)->socketdes = accept(sock->socketdes, (struct sockaddr
*)(*new)->addr,
+ (*new)->connected = 1;
+
+ (*new)->socketdes = accept(sock->socketdes, (struct sockaddr
*)(*new)->local_addr,
&(*new)->addr_len);
if ((*new)->socketdes <0){
@@ -196,21 +170,25 @@
struct hostent *hp;
hp = gethostbyname(hostname);
- if ((sock->socketdes < 0) || (!sock->addr)) {
+ if ((sock->socketdes < 0) || (!sock->remote_addr)) {
return APR_ENOTSOCK;
}
- memcpy((char *)&sock->addr->sin_addr, hp->h_addr , hp->h_length);
+ memcpy((char *)&sock->remote_addr->sin_addr, hp->h_addr , hp->h_length);
- sock->addr->sin_family = AF_INET;
+ sock->remote_addr->sin_family = AF_INET;
- memset(sock->addr->sin_zero, 0, sizeof(sock->addr->sin_zero));
+ memset(sock->remote_addr->sin_zero, 0,
sizeof(sock->remote_addr->sin_zero));
- sock->addr_len = sizeof(sock->addr);
+ sock->addr_len = sizeof(sock->remote_addr);
- while ((connect(sock->socketdes, (const struct sockaddr *)sock->addr,
sock->addr_len) < 0)){
- if (errno != EALREADY && errno != EINPROGRESS)
+ if ((connect(sock->socketdes, (const struct sockaddr
*)sock->remote_addr, sock->addr_len) < 0)
+ && (errno != EINPROGRESS)) {
return errno;
+ } else {
+ int namelen = sizeof(*sock->local_addr);
+ getsockname(sock->socketdes, (struct sockaddr *)sock->local_addr,
&namelen);
+ sock->connected = 1;
}
return APR_SUCCESS;
1.9 +1 -1 apache-2.0/src/lib/apr/network_io/beos/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sockopt.c 1999/10/13 20:14:32 1.8
+++ sockopt.c 1999/10/24 12:27:33 1.9
@@ -106,7 +106,7 @@
{
struct hostent *hptr;
- hptr = gethostbyaddr((char *)&(sock->addr->sin_addr),
+ hptr = gethostbyaddr((char *)&(sock->remote_addr->sin_addr),
sizeof(struct in_addr), AF_INET);
if (hptr != NULL) {
*name = ap_pstrdup(sock->cntxt, hptr->h_name);
1.1 apache-2.0/src/lib/apr/network_io/beos/sockaddr.c
Index: sockaddr.c
===================================================================
/* ====================================================================
* Copyright (c) 1999 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. All advertising materials mentioning features or use of this
* software must display the following acknowledgment:
* "This product includes software developed by the Apache Group
* for use in the Apache HTTP server project (http://www.apache.org/)."
*
* 4. The names "Apache Server" and "Apache Group" must not be used to
* endorse or promote products derived from this software without
* prior written permission. For written permission, please contact
* [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* 6. Redistributions of any form whatsoever must retain the following
* acknowledgment:
* "This product includes software developed by the Apache Group
* for use in the Apache HTTP server project (http://www.apache.org/)."
*
* THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Group.
* For more information on the Apache Group and the Apache HTTP server
* project, please see <http://www.apache.org/>.
*
*/
#include "networkio.h"
#include "apr_network_io.h"
#include "apr_general.h"
#include "apr_lib.h"
#include <errno.h>
#include <string.h>
#include <sys/socket.h>
ap_status_t ap_set_local_port(struct socket_t *sock, ap_uint32_t port)
{
sock->local_addr->sin_port = htons((short)port);
return APR_SUCCESS;
}
ap_status_t ap_set_remote_port(struct socket_t *sock, ap_uint32_t port)
{
sock->remote_addr->sin_port = htons((short)port);
return APR_SUCCESS;
}
ap_status_t ap_get_local_port(ap_uint32_t *port, struct socket_t *sock)
{
*port = ntohs(sock->local_addr->sin_port);
return APR_SUCCESS;
}
ap_status_t ap_get_remote_port(ap_uint32_t *port, struct socket_t *sock)
{
*port = ntohs(sock->remote_addr->sin_port);
return APR_SUCCESS;
}
ap_status_t ap_set_local_ipaddr(struct socket_t *sock, const char *addr)
{
u_long ipaddr;
if (!strcmp(addr, APR_ANYADDR)) {
sock->local_addr->sin_addr.s_addr = htonl(INADDR_ANY);
return APR_SUCCESS;
}
ipaddr = inet_addr(addr);
if (ipaddr == -1) {
return errno;
}
sock->local_addr->sin_addr.s_addr = ipaddr;
return APR_SUCCESS;
}
ap_status_t ap_set_remote_ipaddr(struct socket_t *sock, const char *addr)
{
u_long ipaddr;
if (!strcmp(addr, APR_ANYADDR)) {
sock->remote_addr->sin_addr.s_addr = htonl(INADDR_ANY);
return APR_SUCCESS;
}
ipaddr = inet_addr(addr);
if (ipaddr == (u_long)-1) {
return errno;
}
sock->remote_addr->sin_addr.s_addr = ipaddr;
return APR_SUCCESS;
}
ap_status_t ap_get_local_ipaddr(char **addr, const struct socket_t *sock)
{
*addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr));
return APR_SUCCESS;
}
ap_status_t ap_get_remote_ipaddr(char **addr, const struct socket_t *sock)
{
*addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr));
return APR_SUCCESS;
}
#if HAVE_NETINET_IN_H
ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct
socket_t *sock)
{
*name = sock->local_addr;
return APR_SUCCESS;
}
ap_status_t ap_get_remote_name(struct sockaddr_in **name, const struct
socket_t *sock)
{
*name = sock->remote_addr;
return APR_SUCCESS;
}
#endif
