Commit b44895ca authored by Jeff Trawick's avatar Jeff Trawick
Browse files

updates to changed interfaces to apr_set_port(), apr_get_port(), 

apr_set_ipaddr(), and apr_get_ipaddr()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87050 13f79535-47bb-0310-9956-ffa450edef68
parent 0376baeb

modules/http/http_core.c

+6 −2
Original line number Diff line number Diff line
@@ -739,8 +739,12 @@ AP_DECLARE(apr_port_t) ap_get_server_port(const request_rec *r) 


    if (d->use_canonical_name == USE_CANONICAL_NAME_OFF

	|| d->use_canonical_name == USE_CANONICAL_NAME_DNS) {

        if (r->hostname)

           apr_get_port(&port, APR_LOCAL, r->connection->client_socket);

        if (r->hostname) {

            apr_sockaddr_t *localsa;



            apr_get_sockaddr(&localsa, APR_LOCAL, r->connection->client_socket);

            apr_get_port(&port, localsa);

        }

    }

    /* default */

    return port;

modules/proxy/proxy_ftp.c

+3 −2
Original line number Diff line number Diff line
@@ -872,8 +872,9 @@ int ap_proxy_ftp_handler(request_rec *r, ap_cache_el *c, char *url) 
	    ap_bclose(f);

	    return HTTP_INTERNAL_SERVER_ERROR;

	}

        apr_get_port(&npport, APR_LOCAL, sock);

        apr_get_ipaddr(&npaddr, APR_LOCAL, sock);

        apr_get_sockaddr(&localsa, APR_LOCAL, sock);

        apr_get_port(&npport, localsa);

        apr_get_ipaddr(&npaddr, localsa);



	if (apr_setsocketopt(dsock, APR_SO_REUSEADDR, one) != APR_SUCCESS) {

#ifndef _OSD_POSIX /* BS2000 has this option "always on" */

server/connection.c

+5 −2
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server, 
			    const struct sockaddr_in *saddr, long id)

{

    conn_rec *conn = (conn_rec *) apr_pcalloc(p, sizeof(conn_rec));

    apr_sockaddr_t *sa;



    /* Got a connection structure, so initialize what fields we can

     * (the rest are zeroed out by pcalloc).
@@ -284,12 +285,14 @@ conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server, 


    conn->pool = p;

    conn->local_addr = *saddr;

    apr_get_ipaddr(&conn->local_ip, APR_LOCAL, inout);

    apr_get_sockaddr(&sa, APR_LOCAL, inout);

    apr_get_ipaddr(&conn->local_ip, sa);

    conn->base_server = server;

    conn->client_socket = inout;



    conn->remote_addr = *remaddr;

    apr_get_ipaddr(&conn->remote_ip, APR_REMOTE, inout);   

    apr_get_sockaddr(&sa, APR_REMOTE, inout);

    apr_get_ipaddr(&conn->remote_ip, sa);   

    conn->id = id;



    return conn;

server/listen.c

+10 −6
Original line number Diff line number Diff line
@@ -87,8 +87,9 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server) 
    char *ipaddr;

    apr_sockaddr_t *localsa;



    apr_get_port(&port, APR_LOCAL, s);

    apr_get_ipaddr(&ipaddr, APR_LOCAL, s);

    apr_get_sockaddr(&localsa, APR_LOCAL, s);

    apr_get_port(&port, localsa);

    apr_get_ipaddr(&ipaddr, localsa);

    apr_snprintf(addr, sizeof(addr), "address %s port %u", ipaddr,

		(unsigned) port);
@@ -189,11 +190,13 @@ static void alloc_listener(process_rec *process, char *addr, apr_port_t port) 
    apr_status_t status;

    char *oldaddr;

    apr_port_t oldport;

    apr_sockaddr_t *sa;



    /* see if we've got an old listener for this address:port */

    for (walk = &old_listeners; *walk; walk = &(*walk)->next) {

        apr_get_port(&oldport, APR_LOCAL, (*walk)->sd);

	apr_get_ipaddr(&oldaddr, APR_LOCAL, (*walk)->sd);

        apr_get_sockaddr(&sa, APR_LOCAL, (*walk)->sd);

        apr_get_port(&oldport, sa);

	apr_get_ipaddr(&oldaddr, sa);

	if (!strcmp(oldaddr, addr) && port == oldport) {

	    /* re-use existing record */

	    new = *walk;
@@ -213,8 +216,9 @@ static void alloc_listener(process_rec *process, char *addr, apr_port_t port) 
                 "make_sock: failed to get a socket for %s", addr);

        return;

    }

    apr_set_port(new->sd, APR_LOCAL, port);

    apr_set_ipaddr(new->sd, APR_LOCAL, addr);

    apr_get_sockaddr(&sa, APR_LOCAL, new->sd);

    apr_set_port(sa, port);

    apr_set_ipaddr(sa, addr);

    new->next = ap_listeners;

    ap_listeners = new;

}

server/rfc1413.c

+3 −2
Original line number Diff line number Diff line
@@ -159,8 +159,9 @@ static int get_rfc1413(apr_socket_t *sock, apr_pool_t *p, 
 */

    if (apr_connect(sock, destsa) != APR_SUCCESS)

        return -1;

    apr_get_port(&sav_our_port, APR_LOCAL, sock);

    apr_get_port(&sav_rmt_port, APR_REMOTE, sock);

    apr_get_sockaddr(&localsa, APR_LOCAL, sock);

    apr_get_port(&sav_our_port, localsa);

    sav_rmt_port = RFC1413_PORT;



/* send the data */

    buflen = apr_snprintf(buffer, sizeof(buffer), "%hu,%hu\r\n", sav_rmt_port,