You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/03/15 03:10:36 UTC
cvs commit: apache-2.0/src/lib/apr/network_io/unix poll.c sendrecv.c sockaddr.c sockets.c sockopt.c
rbb 00/03/14 18:10:36
Modified: src/lib/apr/include apr_network_io.h apr_portable.h
src/lib/apr/mmap/unix common.c mmap.c
src/lib/apr/network_io/unix poll.c sendrecv.c sockaddr.c
sockets.c sockopt.c
Log:
Updating more docs. :-)
Revision Changes Path
1.23 +33 -27 apache-2.0/src/lib/apr/include/apr_network_io.h
Index: apr_network_io.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apr_network_io.h 2000/03/10 00:06:09 1.22
+++ apr_network_io.h 2000/03/15 02:10:33 1.23
@@ -138,30 +138,32 @@
/* function definitions */
-ap_status_t ap_create_tcp_socket(ap_socket_t **, ap_context_t *);
-ap_status_t ap_shutdown(ap_socket_t *, ap_shutdown_how_e);
-ap_status_t ap_close_socket(ap_socket_t *);
-
-ap_status_t ap_bind(ap_socket_t *);
-ap_status_t ap_listen(ap_socket_t *, ap_int32_t);
-ap_status_t ap_accept(ap_socket_t **, const ap_socket_t *, ap_context_t *);
-ap_status_t ap_connect(ap_socket_t *, char *);
-
-ap_status_t ap_get_remote_hostname(char **, ap_socket_t *);
-ap_status_t ap_gethostname(char *, int, ap_context_t *);
-ap_status_t ap_get_socketdata(void **, char *, ap_socket_t *);
-ap_status_t ap_set_socketdata(ap_socket_t *, void *, char *,
+ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont);
+ap_status_t ap_shutdown(ap_socket_t *ithesocket, ap_shutdown_how_e how);
+ap_status_t ap_close_socket(ap_socket_t *thesocket);
+
+ap_status_t ap_bind(ap_socket_t *sock);
+ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog);
+ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock,
+ ap_context_t *connection_context);
+ap_status_t ap_connect(ap_socket_t *sock, char *hostname);
+
+ap_status_t ap_get_remote_hostname(char **name, ap_socket_t *sock);
+ap_status_t ap_gethostname(char *buf, int len, ap_context_t *cont);
+ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *sock);
+ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, char *key,
ap_status_t (*cleanup) (void*));
-ap_status_t ap_send(ap_socket_t *, const char *, ap_ssize_t *);
-ap_status_t ap_sendv(ap_socket_t *sock, const struct iovec *vec, ap_int32_t nvec, ap_int32_t *nbytes);
+ap_status_t ap_send(ap_socket_t *sock, const char *buf, ap_ssize_t *len);
+ap_status_t ap_sendv(ap_socket_t *sock, const struct iovec *vec,
+ ap_int32_t nvec, ap_int32_t *len);
#if APR_HAS_SENDFILE
-ap_status_t ap_sendfile(ap_socket_t *sock, ap_file_t *file, ap_hdtr_t *hdtr, ap_off_t *offset,
- ap_size_t *len, ap_int32_t flags);
+ap_status_t ap_sendfile(ap_socket_t *sock, ap_file_t *file, ap_hdtr_t *hdtr,
+ ap_off_t *offset, ap_size_t *len, ap_int32_t flags);
#endif
-ap_status_t ap_recv(ap_socket_t *, char *, ap_ssize_t *);
+ap_status_t ap_recv(ap_socket_t *sock, char *buf, ap_ssize_t *len);
-ap_status_t ap_setsocketopt(ap_socket_t *, ap_int32_t, ap_int32_t);
+ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on);
ap_status_t ap_set_local_port(ap_socket_t *sock, ap_uint32_t port);
ap_status_t ap_set_remote_port(ap_socket_t *sock, ap_uint32_t port);
@@ -175,14 +177,18 @@
ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *sock);
ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t *sock);
-ap_status_t ap_setup_poll(ap_pollfd_t **, ap_int32_t, ap_context_t *);
-ap_status_t ap_poll(ap_pollfd_t *, ap_int32_t *, ap_int32_t);
-ap_status_t ap_add_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t);
-ap_status_t ap_remove_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t);
-ap_status_t ap_clear_poll_sockets(ap_pollfd_t *, ap_int16_t);
-ap_status_t ap_get_revents(ap_int16_t *, ap_socket_t *, ap_pollfd_t *);
-ap_status_t ap_get_polldata(ap_pollfd_t *, char *, void *);
-ap_status_t ap_set_polldata(ap_pollfd_t *, void *, char *,
+ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num,
+ ap_context_t *cont);
+ap_status_t ap_poll(ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout);
+ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset, ap_socket_t *socket,
+ ap_int16_t event);
+ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, ap_socket_t *sock,
+ ap_int16_t events);
+ap_status_t ap_clear_poll_sockets(ap_pollfd_t *aprset, ap_int16_t events);
+ap_status_t ap_get_revents(ap_int16_t *event, ap_socket_t *sock,
+ ap_pollfd_t *aprset);
+ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, char *key, void *data);
+ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, char *key,
ap_status_t (*cleanup) (void *));
/* accessor functions */
1.25 +3 -2 apache-2.0/src/lib/apr/include/apr_portable.h
Index: apr_portable.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- apr_portable.h 2000/03/14 17:47:36 1.24
+++ apr_portable.h 2000/03/15 02:10:33 1.25
@@ -181,7 +181,7 @@
ap_status_t ap_get_os_file(ap_os_file_t *thefile, ap_file_t *file);
ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, ap_dir_t *dir);
-ap_status_t ap_get_os_sock(ap_os_sock_t *, ap_socket_t *);
+ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock);
ap_status_t ap_get_os_lock(ap_os_lock_t *oslock, ap_lock_t *lock);
ap_status_t ap_get_os_proc(ap_os_proc_t *, ap_proc_t *);
ap_status_t ap_get_os_exp_time(ap_os_exp_time_t **, ap_exploded_time_t *);
@@ -195,7 +195,8 @@
ap_context_t *cont);
ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir,
ap_context_t *cont);
-ap_status_t ap_put_os_sock(ap_socket_t **, ap_os_sock_t *, ap_context_t *);
+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_lock(ap_lock_t **lock, ap_os_lock_t *thelock,
ap_context_t *cont);
ap_status_t ap_put_os_proc(ap_proc_t **, ap_os_proc_t *, ap_context_t *);
1.9 +7 -0 apache-2.0/src/lib/apr/mmap/unix/common.c
Index: common.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/common.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- common.c 2000/03/10 00:06:22 1.8
+++ common.c 2000/03/15 02:10:34 1.9
@@ -70,6 +70,13 @@
#if HAVE_MMAP
+/* ***APRDOC********************************************************
+ * ap_status_t ap_mmap_offset(void **addr, ap_mmap_t *mmap, ap_offset_t offset)
+ * Move the pointer into the mmap'ed file to the specified offset.
+ * arg 1) The pointer to the offset specified.
+ * arg 2) The mmap'ed file.
+ * arg 3) The offset to move to.
+ */
ap_status_t ap_mmap_offset(void **addr, ap_mmap_t *mmap, ap_off_t offset)
{
if (offset < 0 || offset > mmap->size)
1.11 +14 -0 apache-2.0/src/lib/apr/mmap/unix/mmap.c
Index: mmap.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mmap.c 2000/03/10 00:06:22 1.10
+++ mmap.c 2000/03/15 02:10:34 1.11
@@ -76,6 +76,15 @@
return errno;
}
+/* ***APRDOC********************************************************
+ * ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset)
+ * Create a new mmap'ed file out of an existing APR file.
+ * arg 1) The newly created mmap'ed file.
+ * arg 2) The file turn into an mmap.
+ * arg 3) The offset into the file to start the data pointer at.
+ * arg 4) The size of the file
+ * arg 5) The context to use when creating the mmap.
+ */
ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset,
ap_size_t size, ap_context_t *cont)
{
@@ -103,6 +112,11 @@
return APR_SUCCESS;
}
+/* ***APRDOC********************************************************
+ * ap_status_t ap_mmap_delete(ap_mmap_t *mmap)
+ * Remove a mmap'ed.
+ * arg 1) The mmap'ed file.
+ */
ap_status_t ap_mmap_delete(struct mmap_t *mmap)
{
ap_status_t rv;
1.18 +19 -14 apache-2.0/src/lib/apr/network_io/unix/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- poll.c 2000/03/10 00:06:28 1.17
+++ poll.c 2000/03/15 02:10:35 1.18
@@ -58,11 +58,12 @@
#ifdef HAVE_POLL /* We can just use poll to do our socket polling. */
/* ***APRDOC********************************************************
- * ap_status_t ap_setup_poll(ap_pollfd_t **, ap_int32_t, ap_context_t *)
+ * ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num,
+ * ap_context_t *cont)
* Setup the memory required for poll to operate properly.
- * arg 1) The context to operate on.
+ * arg 1) The poll structure to be used.
* arg 2) The number of socket descriptors to be polled.
- * arg 3) The poll structure to be used.
+ * arg 3) The context to operate on.
*/
ap_status_t ap_setup_poll(struct pollfd_t **new, ap_int32_t num, ap_context_t *cont)
{
@@ -120,7 +121,8 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_add_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t)
+ * ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset, ap_socket_t *sock,
+ * ap_int16_t event)
* Add a socket to the poll structure.
* arg 1) The poll structure we will be using.
* arg 2) The socket to add to the current poll structure.
@@ -147,7 +149,8 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_poll(ap_pollfd_t *, ap_int32_t *, ap_int32_t)
+ * ap_status_t ap_poll(ap_pollfd_t *aprset, ap_int32_t *nsds,
+ * ap_int32_t timeout)
* Poll the sockets in the poll structure. This is a blocking call,
* and it will not return until either a socket has been signalled, or
* the timeout has expired.
@@ -190,11 +193,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_revents(ap_int_16_t *, ap_socket_t *, ap_pollfd_t *)
+ * ap_status_t ap_get_revents(ap_int_16_t *event, ap_socket_t *sock,
+ * ap_pollfd_t *aprset)
* Get the return events for the specified socket.
- * arg 1) The poll structure we will be using.
- * arg 2) The socket we wish to get information about.
- * arg 3) The returned events for the socket. One of:
+ * arg 1) The returned events for the socket. One of:
* APR_POLLIN -- Data is available to be read
* APR_POLLPRI -- Prioirty data is availble to be read
* APR_POLLOUT -- Write will succeed
@@ -202,6 +204,8 @@
* APR_POLLHUP -- The connection has been terminated
* APR_POLLNVAL -- This is an invalid socket to poll on.
* Socket not open.
+ * arg 2) The socket we wish to get information about.
+ * arg 3) The poll structure we will be using.
*/
ap_status_t ap_get_revents(ap_int16_t *event, struct socket_t *sock, struct pollfd_t *aprset)
{
@@ -218,7 +222,8 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_remove_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t)
+ * ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, ap_socket_t *sock,
+ * ap_int16_t events)
* Add a socket to the poll structure.
* arg 1) The poll structure we will be using.
* arg 2) The socket to remove from the current poll structure.
@@ -248,10 +253,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_clear_poll_sockets(ap_pollfd_t *)
+ * ap_status_t ap_clear_poll_sockets(ap_pollfd_t *aprset, ap_int16_t events)
* Remove all sockets from the poll structure.
* arg 1) The poll structure we will be using.
- * arg 3) The events to clear from all sockets. One of:
+ * arg 2) The events to clear from all sockets. One of:
* APR_POLLIN -- signal if read will not block
* APR_POLLPRI -- signal if prioirty data is availble to be read
* APR_POLLOUT -- signal if write will not block
@@ -417,7 +422,7 @@
#endif
/* ***APRDOC********************************************************
- * ap_status_t ap_get_polldata(ap_pollfd_t *, char *, void *)
+ * ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, char *key, void *data)
* Return the context associated with the current poll.
* arg 1) The currently open pollfd.
* arg 2) The key to use for retreiving data associated with a poll struct.
@@ -435,7 +440,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_set_polldata(ap_pollfd_t *, void *, char *,
+ * ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, char *key,
ap_status_t (*cleanup) (void *))
* Return the context associated with the current poll.
* arg 1) The currently open pollfd.
1.15 +10 -9 apache-2.0/src/lib/apr/network_io/unix/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sendrecv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sendrecv.c 2000/03/10 00:06:28 1.14
+++ sendrecv.c 2000/03/15 02:10:35 1.15
@@ -98,7 +98,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_send(ap_socket_t *, const char *, ap_ssize_t *, time_t)
+ * ap_status_t ap_send(ap_socket_t *sock, const char *buf, ap_ssize_t *len)
* Send data over a network.
* arg 1) The socket to send the data over.
* arg 2) The buffer which contains the data to be sent.
@@ -136,7 +136,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_recv(ap_socket_t *, char *, ap_ssize_t *, time_t)
+ * ap_status_t ap_recv(ap_socket_t *sock, char *buf, ap_ssize_t *len)
* Read data from a network.
* arg 1) The socket to read the data from.
* arg 2) The buffer to store the data in.
@@ -174,7 +174,8 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_sendv(ap_socket_t *, const struct iovec *, ap_int32_t, ap_int32_t *)
+ * ap_status_t ap_sendv(ap_socket_t *sock, const struct iovec *vec,
+ ap_int32_t nvec, ap_int32_t *len)
* Send multiple packets of data over a network.
* arg 1) The socket to send the data over.
* arg 2) The array of iovec structs containing the data to send
@@ -184,8 +185,8 @@
* this behavior, use ap_setsocketopt with the APR_SO_TIMEOUT option.
* The number of bytes actually sent is stored in argument 3.
*/
-ap_status_t ap_sendv(struct socket_t * sock, const struct iovec * vec,
- ap_int32_t nvec, ap_int32_t * len)
+ap_status_t ap_sendv(struct socket_t * sock, const struct iovec *vec,
+ ap_int32_t nvec, ap_int32_t *len)
{
ssize_t rv;
@@ -215,8 +216,8 @@
#if defined(HAVE_SENDFILE)
/* ***APRDOC********************************************************
- * ap_status_t ap_sendfile(ap_socket_t *, ap_file_t *, ap_hdtr_t *,
- * ap_off_t *, ap_size_t *, ap_int32_t flags)
+ * ap_status_t ap_sendfile(ap_socket_t *sock, ap_file_t *file, ap_hdtr_t *hdtr,
+ * ap_off_t *offset, ap_size_t *len, ap_int32_t flags)
* Send a file from an open file descriptor to a socket, along with
* optional headers and trailers
* arg 1) The socket to which we're writing
@@ -236,8 +237,8 @@
*/
#if defined(__linux__) && defined(HAVE_WRITEV)
-ap_status_t ap_sendfile(ap_socket_t * sock, ap_file_t * file,
- ap_hdtr_t * hdtr, ap_off_t * offset, ap_size_t * len,
+ap_status_t ap_sendfile(ap_socket_t *sock, ap_file_t *file,
+ ap_hdtr_t *hdtr, ap_off_t *offset, ap_size_t *len,
ap_int32_t flags)
{
off_t off = *offset;
1.6 +12 -10 apache-2.0/src/lib/apr/network_io/unix/sockaddr.c
Index: sockaddr.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockaddr.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sockaddr.c 2000/03/10 00:06:28 1.5
+++ sockaddr.c 2000/03/15 02:10:35 1.6
@@ -56,7 +56,7 @@
#include "networkio.h"
/* ***APRDOC********************************************************
- * ap_status_t ap_set_local_port(ap_socket_t *socket, ap_uint32_t port)
+ * ap_status_t ap_set_local_port(ap_socket_t *sock, ap_uint32_t port)
* Assocaite a local port with a socket.
* arg 1) The socket to set
* arg 2) The local port this socket will be dealing with.
@@ -73,7 +73,7 @@
/* ***APRDOC********************************************************
- * ap_status_t ap_set_remote_port(ap_socket_t *socket, ap_uint32_t port)
+ * ap_status_t ap_set_remote_port(ap_socket_t *sock, ap_uint32_t port)
* Assocaite a remote port with a socket.
* arg 1) The socket to enquire about.
* arg 2) The local port this socket will be dealing with.
@@ -89,7 +89,7 @@
/* ***APRDOC********************************************************
- * ap_status_t ap_get_local_port(ap_uint32_t *port, ap_socket_t *socket)
+ * ap_status_t ap_get_local_port(ap_uint32_t *port, ap_socket_t *sock)
* Return the local port with a socket.
* arg 1) The local port this socket is associated with.
* arg 2) The socket to enquire about.
@@ -103,7 +103,7 @@
/* ***APRDOC********************************************************
- * ap_status_t ap_get_remote_port(ap_uint32_t *port, ap_socket_t *socket)
+ * ap_status_t ap_get_remote_port(ap_uint32_t *port, ap_socket_t *sock)
* Return the remote port associated with a socket.
* arg 1) The remote port this socket is associated with.
* arg 2) The socket to enquire about.
@@ -117,7 +117,7 @@
/* ***APRDOC********************************************************
- * ap_status_t ap_set_local_ipaddr(ap_socket_t *socket, cont char *addr)
+ * ap_status_t ap_set_local_ipaddr(ap_socket_t *sock, cont char *addr)
* Assocaite a local socket addr with an apr socket.
* arg 1) The socket to use
* arg 2) The IP address to attach to the socket.
@@ -147,7 +147,7 @@
/* ***APRDOC********************************************************
- * ap_status_t ap_set_remote_ipaddr(ap_socket_t *socket, cont char *addr)
+ * ap_status_t ap_set_remote_ipaddr(ap_socket_t *sock, cont char *addr)
* Assocaite a remote socket addr with an apr socket.
* arg 1) The socket to use
* arg 2) The IP address to attach to the socket.
@@ -176,7 +176,7 @@
/* ***APRDOC********************************************************
- * ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *socket)
+ * ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *sock)
* Return the local IP address associated with an apr socket.
* arg 1) The local IP address associated with the socket.
* arg 2) The socket to use
@@ -190,7 +190,7 @@
/* ***APRDOC********************************************************
- * ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *socket)
+ * ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *sock)
* Return the remote IP address associated with an apr socket.
* arg 1) The remote IP address associated with the socket.
* arg 2) The socket to use
@@ -205,7 +205,8 @@
#if HAVE_NETINET_IN_H
/* ***APRDOC********************************************************
- * ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *socket)
+ * ap_status_t ap_get_local_name(struct sockaddr_in **name,
+ * const ap_socket_t *sock)
* Return the local socket name as a BSD style struct sockaddr_in.
* arg 1) The local name associated with the socket.
* arg 2) The socket to use
@@ -219,7 +220,8 @@
/* ***APRDOC********************************************************
- * ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t *socket)
+ * ap_status_t ap_get_remote_name(struct sockaddr_in **name,
+ * const ap_socket_t *sock)
* Return the remote socket name as a BSD style struct sockaddr_in.
* arg 1) The remote name associated with the socket.
* arg 2) The socket to use
1.30 +17 -13 apache-2.0/src/lib/apr/network_io/unix/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sockets.c 2000/03/10 00:06:28 1.29
+++ sockets.c 2000/03/15 02:10:35 1.30
@@ -69,10 +69,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_create_tcp_socket(ap_socket_t **, ap_context_t *)
+ * ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont)
* Create a socket for tcp communication.
- * arg 1) The context to use
- * arg 2) The new socket that has been setup.
+ * arg 1) The new socket that has been setup.
+ * arg 2) The context to use
*/
ap_status_t ap_create_tcp_socket(struct socket_t **new, ap_context_t *cont)
{
@@ -108,7 +108,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_shutdown(ap_socket_t *, ap_shutdown_how_e)
+ * ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how)
* Shutdown either reading, writing, or both sides of a tcp socket.
* arg 1) The socket to close
* arg 2) How to shutdown the socket. One of:
@@ -129,7 +129,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_close_socket(ap_socket_t *)
+ * ap_status_t ap_close_socket(ap_socket_t *thesocket)
* Close a tcp socket.
* arg 1) The socket to close
*/
@@ -140,7 +140,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_bind(ap_socket_t *)
+ * ap_status_t ap_bind(ap_socket_t *sock)
* Bind the socket to it's assocaited port
* arg 1) The socket to bind
* NOTE: This is where we will find out if there is any other process
@@ -155,7 +155,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_listen(ap_socket_t *, ap_int32_t)
+ * ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
* Listen to a bound socketi for connections.
* arg 1) The socket to listen on
* arg 2) The number of outstanding connections allowed in the sockets
@@ -171,7 +171,8 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_accept(ap_socket_t **, ap_socket_t *, ap_context_t *connection_context)
+ * ap_status_t ap_accept(ap_socket_t **new, ap_socket_t *sock,
+ ap_context_t *connection_context)
* Accept a new connection request
* arg 1) A copy of the socket that is connected to the socket that
* made the connection request. This is the socket which should
@@ -212,7 +213,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_connect(ap_socket_t *, char *)
+ * ap_status_t ap_connect(ap_socket_t *sock, char *hostname)
* Issue a connection request to a socket either on the same machine
* or a different one.
* arg 1) The socket we wish to use for our side of the connection
@@ -257,7 +258,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_socketdata(void **, char *, ap_socket_t *)
+ * ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *sock)
* Return the context associated with the current socket.
* arg 1) The currently open socket.
* arg 2) The user data associated with the socket.
@@ -274,11 +275,13 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_set_socketdata(ap_socket_t *, void *, char *,
+ * ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, char *key,
ap_status_t (*cleanup) (void *))
* Set the context associated with the current socket.
* arg 1) The currently open socket.
* arg 2) The user data to associate with the socket.
+ * arg 3) The key to associate with the data.
+ * arg 4) The cleanup to call when the socket is destroyed.
*/
ap_status_t ap_set_socketdata(struct socket_t *sock, void *data, char *key,
ap_status_t (*cleanup) (void *))
@@ -293,7 +296,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_os_sock(ap_os_sock_t *, ap_socket_t *)
+ * ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock)
* Convert the socket from an apr type to an OS specific socket
* arg 1) The socket to convert.
* arg 2) The os specifc equivelant of the apr socket..
@@ -308,7 +311,8 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_put_os_sock(ap_socket_t **, ap_os_socket_t *, ap_context_t *)
+ * ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_socket_t *thesock,
+ * ap_context_t *cont)
* Convert a socket from the os specific type to the apr type
* arg 1) The context to use.
* arg 2) The socket to convert to.
1.16 +8 -8 apache-2.0/src/lib/apr/network_io/unix/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockopt.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sockopt.c 2000/03/10 00:06:28 1.15
+++ sockopt.c 2000/03/15 02:10:35 1.16
@@ -98,7 +98,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_setsocketopt(ap_socket_t *, ap_int32_t , ap_int32_t)
+ * ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
* Setup socket options for the specified socket
* arg 1) The socket to set up.
* arg 2) The option we would like to configure. One of:
@@ -173,12 +173,12 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_gethostname(char *, ap_int32_t, ap_context_t *)
+ * ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_context_t *cont)
* Get name of the current machine
- * arg 1) The context to use.
- * arg 2) A buffer to store the hostname in.
- * arg 3) The maximum length of the hostname that can be stored in the
+ * arg 1) A buffer to store the hostname in.
+ * arg 2) The maximum length of the hostname that can be stored in the
* buffer provided.
+ * arg 3) The context to use.
*/
ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_context_t *cont)
{
@@ -189,10 +189,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_remote_hostname(ap_socket_t *, char *)
+ * ap_status_t ap_get_remote_hostname(char **name, ap_socket_t *sock)
* Get name of the machine we are currently connected to.
- * arg 1) The socket to examine.
- * arg 2) A buffer to store the hostname in.
+ * arg 1) A buffer to store the hostname in.
+ * arg 2) The socket to examine.
*/
ap_status_t ap_get_remote_hostname(char **name, struct socket_t *sock)
{