From: Ryan Bloom Date: Sun, 10 Oct 1999 20:35:06 +0000 (+0000) Subject: Bring network code to the parameter order spec. This means contexts go last, X-Git-Tag: 1.3.10~287 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=644262a3ac18d16d1d02cc1934bc0ef9d8909e72;p=thirdparty%2Fapache%2Fhttpd.git Bring network code to the parameter order spec. This means contexts go last, and result parameters go first. Also fixed a small bug in the Makefile. We should be removing the libs dir when we do a distclean, we are now. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83956 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/listen.c b/server/listen.c index 5ded01b0af3..c016ccaf7c9 100644 --- a/server/listen.c +++ b/server/listen.c @@ -160,7 +160,7 @@ static void alloc_listener(process_rec *process, char *addr, unsigned int port) /* see if we've got an old listener for this address:port */ for (walk = &old_listeners; *walk; walk = &(*walk)->next) { - ap_getport((*walk)->sd, &oldport); + ap_getport(&oldport, (*walk)->sd); ap_getipaddr(oldaddr,sizeof oldaddr,(*walk)->sd); if (!strcmp(oldaddr, addr) && port == oldport) { /* re-use existing record */ diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c index cff180d78dc..a2e2ae63970 100644 --- a/server/mpm/dexter/dexter.c +++ b/server/mpm/dexter/dexter.c @@ -952,7 +952,7 @@ static void *worker_thread(void *arg) pthread_mutex_unlock(&idle_thread_count_mutex); break; } - ap_get_os_sock(csd, &native_socket); + ap_get_os_sock(&native_socket, csd); process_socket(ptrans, &sa_client, native_socket, conn_id); ap_clear_pool(ptrans); requests_this_child--; @@ -1011,7 +1011,7 @@ static void child_main(int child_num_arg) listenfds[0].events = POLLIN; listenfds[0].revents = 0; for (lr = ap_listeners, i = 1; i <= num_listenfds; lr = lr->next, ++i) { - ap_get_os_sock(lr->sd, &listenfds[i].fd); + ap_get_os_sock(&listenfds[i].fd, lr->sd); listenfds[i].events = POLLIN; /* should we add POLLPRI ?*/ listenfds[i].revents = 0; } diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c index 97254b512d9..cffac05e460 100644 --- a/server/mpm/mpmt_pthread/mpmt_pthread.c +++ b/server/mpm/mpmt_pthread/mpmt_pthread.c @@ -816,7 +816,7 @@ static void * worker_thread(void * dummy) worker_thread_count++; pthread_mutex_unlock(&worker_thread_count_mutex); - ap_setup_poll(&pollset, tpool, num_listensocks+1); + ap_setup_poll(&pollset, num_listensocks+1, tpool); for(n=0 ; n <= num_listensocks ; ++n) ap_add_poll_socket(pollset, listensocks[n], APR_POLLIN); @@ -853,7 +853,7 @@ static void * worker_thread(void * dummy) if (workers_may_exit) break; - ap_get_revents(pollset, listensocks[0], &event); + ap_get_revents(&event, listensocks[0], pollset); if (event & APR_POLLIN) { /* A process got a signal on the shutdown pipe. Check if we're * the lucky process to die. */ @@ -874,7 +874,7 @@ static void * worker_thread(void * dummy) curr_pollfd = 1; } /* XXX: Should we check for POLLERR? */ - ap_get_revents(pollset, listensocks[curr_pollfd], &event); + ap_get_revents(&event, listensocks[curr_pollfd], pollset); if (event & APR_POLLIN) { last_pollfd = curr_pollfd; sd=listensocks[curr_pollfd]; @@ -894,7 +894,7 @@ static void * worker_thread(void * dummy) SAFE_ACCEPT(intra_mutex_off(0)); break; } - ap_get_os_sock(csd, &thesock); + ap_get_os_sock(&thesock, csd); process_socket(ptrans, &sa_client, thesock, process_slot, thread_slot); ap_clear_pool(ptrans); requests_this_child--; diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index e628997bca1..41e8f033d52 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -2047,7 +2047,7 @@ static void child_main(int child_num_arg) } first_lr=lr; do { - ap_get_os_sock(lr->sd, &sockdes); + ap_get_os_sock(&sockdes, lr->sd); if (FD_ISSET(sockdes, &main_fds)) goto got_listener; lr = lr->next; @@ -2206,7 +2206,7 @@ static void child_main(int child_num_arg) * socket options, file descriptors, and read/write buffers. */ - ap_get_os_sock(csd, &sockdes); + ap_get_os_sock(&sockdes, csd); clen = sizeof(sa_server); if (getsockname(sockdes, &sa_server, &clen) < 0) { @@ -2544,7 +2544,7 @@ static int setup_listeners(server_rec *s) listenmaxfd = -1; FD_ZERO(&listenfds); for (lr = ap_listeners; lr; lr = lr->next) { - ap_get_os_sock(lr->sd, &sockdes); + ap_get_os_sock(&sockdes, lr->sd); FD_SET(sockdes, &listenfds); if (sockdes > listenmaxfd) { listenmaxfd = sockdes; diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index 4242e75d403..13fa16edbca 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -353,7 +353,7 @@ static ap_inline ap_listen_rec *find_ready_listener(fd_set * main_fds) SOCKET nsd; for (lr = head_listener; lr ; lr = lr->next) { - ap_get_os_sock(lr->sd, &nsd); + ap_get_os_sock(&nsd, lr->sd); if (FD_ISSET(nsd, main_fds)) { head_listener = lr->next; if (head_listener == NULL) @@ -379,7 +379,7 @@ static int setup_listeners(ap_context_t *pconf, server_rec *s) for (lr = ap_listeners; lr; lr = lr->next) { num_listeners++; if (lr->sd != NULL) { - ap_get_os_sock(lr->sd, &nsd); + ap_get_os_sock(&nsd, lr->sd); FD_SET(nsd, &listenfds); if (listenmaxfd == INVALID_SOCKET || nsd > listenmaxfd) { listenmaxfd = nsd; @@ -749,7 +749,7 @@ static int create_and_queue_completion_context(ap_context_t *p, ap_listen_rec *l context->conn_io = ap_bcreate(context->ptrans, B_RDWR); context->recv_buf = context->conn_io->inbase; context->recv_buf_size = context->conn_io->bufsiz - 2*PADDED_ADDR_SIZE; - ap_get_os_sock(context->lr->sd, &nsd); + ap_get_os_sock(&nsd, context->lr->sd); AcceptEx(nsd,//context->lr->fd, context->accept_socket, @@ -779,7 +779,7 @@ static ap_inline void reset_completion_context(PCOMP_CONTEXT context) context->conn_io = ap_bcreate(context->ptrans, B_RDWR); context->recv_buf = context->conn_io->inbase; context->recv_buf_size = context->conn_io->bufsiz - 2*PADDED_ADDR_SIZE; - ap_get_os_sock(context->lr->sd, &nsd); + ap_get_os_sock(&nsd, context->lr->sd); rc = AcceptEx(nsd, //context->lr->fd, context->accept_socket, @@ -1082,7 +1082,7 @@ static void worker_main() /* Associate each listener with the completion port */ for (lr = ap_listeners; lr != NULL; lr = lr->next) { - ap_get_os_sock(lr->sd, &nsd); + ap_get_os_sock(&nsd, lr->sd); CreateIoCompletionPort((HANDLE) nsd, //(HANDLE)lr->fd, AcceptExCompPort, 0, diff --git a/server/rfc1413.c b/server/rfc1413.c index c3d8be2a19a..ac7092167da 100644 --- a/server/rfc1413.c +++ b/server/rfc1413.c @@ -131,7 +131,7 @@ static int get_rfc1413(ap_socket_t *sock, const char *local_ip, "bind: rfc1413: Error binding to local port"); return -1; } - ap_getport(sock, &sav_our_port); + ap_getport(&sav_our_port, sock); /* * errors from connect usually imply the remote machine doesn't support @@ -142,7 +142,7 @@ static int get_rfc1413(ap_socket_t *sock, const char *local_ip, if (ap_connect(sock, NULL) != APR_SUCCESS) return -1; - ap_getport(sock, &sav_rmt_port); + ap_getport(&sav_rmt_port, sock); /* send the data */ buflen = ap_snprintf(buffer, sizeof(buffer), "%u,%u\r\n", sav_rmt_port,