You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by ja...@apache.org on 2003/09/09 11:49:50 UTC
cvs commit: httpd-test/flood flood_net.c
jacekp 2003/09/09 02:49:50
Modified: flood flood_net.c
Log:
Sync with APR 1.0 API.
Revision Changes Path
1.13 +5 -5 httpd-test/flood/flood_net.c
Index: flood_net.c
===================================================================
RCS file: /home/cvs/httpd-test/flood/flood_net.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- flood_net.c 6 Sep 2003 04:27:37 -0000 1.12
+++ flood_net.c 9 Sep 2003 09:49:50 -0000 1.13
@@ -78,14 +78,14 @@
}
if ((rv = apr_socket_create(&fs->socket, APR_INET, SOCK_STREAM,
- pool)) != APR_SUCCESS) {
+ APR_PROTO_TCP, pool)) != APR_SUCCESS) {
if (status) {
*status = rv;
}
return NULL;
}
- if ((rv = apr_connect(fs->socket, destsa)) != APR_SUCCESS) {
+ if ((rv = apr_socket_connect(fs->socket, destsa)) != APR_SUCCESS) {
if (APR_STATUS_IS_EINPROGRESS(rv)) {
/* FIXME: Handle better */
close_socket(fs);
@@ -115,7 +115,7 @@
}
}
- apr_setsocketopt(fs->socket, APR_SO_TIMEOUT, LOCAL_SOCKET_TIMEOUT);
+ apr_socket_opt_set(fs->socket, APR_SO_TIMEOUT, LOCAL_SOCKET_TIMEOUT);
fs->read_pollset.desc_type = APR_POLL_SOCKET;
fs->read_pollset.desc.s = fs->socket;
fs->read_pollset.reqevents = APR_POLLIN;
@@ -139,7 +139,7 @@
e = apr_poll(&s->read_pollset, 1, &socketsRead, LOCAL_SOCKET_TIMEOUT);
if (e != APR_SUCCESS)
return e;
- return apr_recv(s->socket, buf, buflen);
+ return apr_socket_recv(s->socket, buf, buflen);
}
apr_status_t write_socket(flood_socket_t *s, request_t *r)
@@ -149,7 +149,7 @@
l = r->rbufsize;
- e = apr_send(s->socket, r->rbuf, &l);
+ e = apr_socket_send(s->socket, r->rbuf, &l);
/* FIXME: Better error and allow restarts? */
if (l != r->rbufsize)