summaryrefslogtreecommitdiff
path: root/network_io
diff options
context:
space:
mode:
Diffstat (limited to 'network_io')
-rw-r--r--network_io/beos/networkio.h4
-rw-r--r--network_io/beos/poll.c2
-rw-r--r--network_io/beos/sockets.c6
-rw-r--r--network_io/beos/sockopt.c2
-rw-r--r--network_io/os2/networkio.h4
-rw-r--r--network_io/os2/poll.c2
-rw-r--r--network_io/os2/sockets.c6
-rw-r--r--network_io/os2/sockopt.c2
-rw-r--r--network_io/unix/networkio.h4
-rw-r--r--network_io/unix/poll.c4
-rw-r--r--network_io/unix/sockets.c6
-rw-r--r--network_io/unix/sockopt.c2
-rw-r--r--network_io/win32/networkio.h4
-rw-r--r--network_io/win32/poll.c2
-rw-r--r--network_io/win32/sockets.c6
-rw-r--r--network_io/win32/sockopt.c2
16 files changed, 29 insertions, 29 deletions
diff --git a/network_io/beos/networkio.h b/network_io/beos/networkio.h
index c085fc332..e971e489f 100644
--- a/network_io/beos/networkio.h
+++ b/network_io/beos/networkio.h
@@ -86,7 +86,7 @@
#define POLLNVAL 32
struct ap_socket_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
int socketdes;
struct sockaddr_in *local_addr;
struct sockaddr_in *remote_addr;
@@ -96,7 +96,7 @@ struct ap_socket_t {
};
struct ap_pollfd_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
struct ap_socket_t *sock;
fd_set *read;
fd_set *write;
diff --git a/network_io/beos/poll.c b/network_io/beos/poll.c
index 3d8b34263..a29c3bf73 100644
--- a/network_io/beos/poll.c
+++ b/network_io/beos/poll.c
@@ -63,7 +63,7 @@
/* select for R4.5 of BeOS. So here we use code that uses the write */
/* bits. */
-ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
+ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
{
(*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t) * num);
if ((*new) == NULL) {
diff --git a/network_io/beos/sockets.c b/network_io/beos/sockets.c
index 5e77798c7..8117db836 100644
--- a/network_io/beos/sockets.c
+++ b/network_io/beos/sockets.c
@@ -66,7 +66,7 @@ ap_status_t socket_cleanup(void *sock)
}
}
-ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont)
+ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
{
(*new) = (ap_socket_t *)ap_palloc(cont,sizeof(ap_socket_t));
@@ -127,7 +127,7 @@ ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
return APR_SUCCESS;
}
-ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_context_t *connection_context)
+ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *connection_context)
{
(*new) = (ap_socket_t *)ap_palloc(connection_context,
sizeof(ap_socket_t));
@@ -219,7 +219,7 @@ ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock)
}
ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
diff --git a/network_io/beos/sockopt.c b/network_io/beos/sockopt.c
index c0a85aa21..6472fe4ee 100644
--- a/network_io/beos/sockopt.c
+++ b/network_io/beos/sockopt.c
@@ -83,7 +83,7 @@ ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
return APR_SUCCESS;
}
-ap_status_t ap_gethostname(char * buf, int len, ap_context_t *cont)
+ap_status_t ap_gethostname(char * buf, int len, ap_pool_t *cont)
{
if (gethostname(buf, len) == -1){
return errno;
diff --git a/network_io/os2/networkio.h b/network_io/os2/networkio.h
index a8fd397a5..c0be3720b 100644
--- a/network_io/os2/networkio.h
+++ b/network_io/os2/networkio.h
@@ -60,7 +60,7 @@
#include "os2calls.h"
struct ap_socket_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
int socketdes;
struct sockaddr_in *local_addr;
struct sockaddr_in *remote_addr;
@@ -70,7 +70,7 @@ struct ap_socket_t {
};
struct ap_pollfd_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
int *socket_list;
int *r_socket_list;
int num_read;
diff --git a/network_io/os2/poll.c b/network_io/os2/poll.c
index 2d7b67e8f..32dc2bad4 100644
--- a/network_io/os2/poll.c
+++ b/network_io/os2/poll.c
@@ -64,7 +64,7 @@
/* OS/2 doesn't have a poll function, implement using OS/2 style select */
-ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
+ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
{
*new = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t));
diff --git a/network_io/os2/sockets.c b/network_io/os2/sockets.c
index ef8200304..ced9a179c 100644
--- a/network_io/os2/sockets.c
+++ b/network_io/os2/sockets.c
@@ -78,7 +78,7 @@ static ap_status_t socket_cleanup(void *sock)
}
}
-ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont)
+ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
{
(*new) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
@@ -147,7 +147,7 @@ ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
return APR_SUCCESS;
}
-ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_context_t *connection_context)
+ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *connection_context)
{
(*new) = (ap_socket_t *)ap_palloc(connection_context,
sizeof(ap_socket_t));
@@ -240,7 +240,7 @@ ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock)
-ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, ap_context_t *cont)
+ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
diff --git a/network_io/os2/sockopt.c b/network_io/os2/sockopt.c
index 17c1e591f..1da0c6bf6 100644
--- a/network_io/os2/sockopt.c
+++ b/network_io/os2/sockopt.c
@@ -118,7 +118,7 @@ ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
-ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_context_t *cont)
+ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_pool_t *cont)
{
if (gethostname(buf, len) == -1)
return APR_OS2_STATUS(sock_errno());
diff --git a/network_io/unix/networkio.h b/network_io/unix/networkio.h
index d3e3f732c..951c045a7 100644
--- a/network_io/unix/networkio.h
+++ b/network_io/unix/networkio.h
@@ -107,7 +107,7 @@
/* End System Headers */
struct ap_socket_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
int socketdes;
struct sockaddr_in *local_addr;
struct sockaddr_in *remote_addr;
@@ -119,7 +119,7 @@ struct ap_socket_t {
};
struct ap_pollfd_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
#ifdef HAVE_POLL
int *sock;
int curpos;
diff --git a/network_io/unix/poll.c b/network_io/unix/poll.c
index 99f9beaa2..61fd029fc 100644
--- a/network_io/unix/poll.c
+++ b/network_io/unix/poll.c
@@ -56,7 +56,7 @@
#ifdef HAVE_POLL /* We can just use poll to do our socket polling. */
-ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
+ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
{
(*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t));
(*new)->sock = ap_palloc(cont, sizeof(ap_socket_t) * num);
@@ -211,7 +211,7 @@ ap_status_t ap_clear_poll_sockets(ap_pollfd_t *aprset, ap_int16_t events)
#else /* Use select to mimic poll */
-ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
+ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
{
(*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t) * num);
if ((*new) == NULL) {
diff --git a/network_io/unix/sockets.c b/network_io/unix/sockets.c
index 685780b87..aaf360cd6 100644
--- a/network_io/unix/sockets.c
+++ b/network_io/unix/sockets.c
@@ -67,7 +67,7 @@ static ap_status_t socket_cleanup(void *sock)
}
}
-ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont)
+ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
{
(*new) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
@@ -132,7 +132,7 @@ ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
return APR_SUCCESS;
}
-ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_context_t *connection_context)
+ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *connection_context)
{
(*new) = (ap_socket_t *)ap_palloc(connection_context,
sizeof(ap_socket_t));
@@ -231,7 +231,7 @@ ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock)
}
ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
diff --git a/network_io/unix/sockopt.c b/network_io/unix/sockopt.c
index eb7a0d2af..45f64a5f5 100644
--- a/network_io/unix/sockopt.c
+++ b/network_io/unix/sockopt.c
@@ -153,7 +153,7 @@ ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
return APR_SUCCESS;
}
-ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_context_t *cont)
+ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_pool_t *cont)
{
if (gethostname(buf, len) == -1)
return errno;
diff --git a/network_io/win32/networkio.h b/network_io/win32/networkio.h
index a008062ea..5421312e2 100644
--- a/network_io/win32/networkio.h
+++ b/network_io/win32/networkio.h
@@ -59,7 +59,7 @@
#include "apr_general.h"
struct ap_socket_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
SOCKET sock;
struct sockaddr_in *local_addr;
struct sockaddr_in *remote_addr;
@@ -68,7 +68,7 @@ struct ap_socket_t {
};
struct ap_pollfd_t {
- ap_context_t *cntxt;
+ ap_pool_t *cntxt;
fd_set *read;
int numread;
fd_set *write;
diff --git a/network_io/win32/poll.c b/network_io/win32/poll.c
index e5fd905d4..e0fb060f6 100644
--- a/network_io/win32/poll.c
+++ b/network_io/win32/poll.c
@@ -61,7 +61,7 @@
#include <time.h>
-ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
+ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
{
(*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t) * num);
if ((*new) == NULL) {
diff --git a/network_io/win32/sockets.c b/network_io/win32/sockets.c
index 19f159d49..985e21e0f 100644
--- a/network_io/win32/sockets.c
+++ b/network_io/win32/sockets.c
@@ -74,7 +74,7 @@ static ap_status_t socket_cleanup(void *sock)
}
}
-ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont)
+ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
{
(*new) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
@@ -158,7 +158,7 @@ ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
return APR_SUCCESS;
}
-ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_context_t *connection_context)
+ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *connection_context)
{
(*new) = (ap_socket_t *)ap_palloc(connection_context,
sizeof(ap_socket_t));
@@ -259,7 +259,7 @@ ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock)
}
ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock,
- ap_context_t *cont)
+ ap_pool_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;
diff --git a/network_io/win32/sockopt.c b/network_io/win32/sockopt.c
index ba81d1a7e..d45e7b82e 100644
--- a/network_io/win32/sockopt.c
+++ b/network_io/win32/sockopt.c
@@ -133,7 +133,7 @@ ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
return APR_SUCCESS;
}
-ap_status_t ap_gethostname(char *buf, int len, ap_context_t *cont)
+ap_status_t ap_gethostname(char *buf, int len, ap_pool_t *cont)
{
if (gethostname(buf, len) == -1)
return APR_EEXIST;
View Lorry Controller Status